Merge branch 'develop' into allow-suspended-access

.config/docker_example.yml

@@ -114,6 +114,7 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@@ -121,7 +122,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!
 
-id: 'aid'
+id: 'aidx'
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────

.config/example.yml

@@ -125,6 +125,7 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@@ -132,7 +133,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!
 
-id: 'aid'
+id: 'aidx'
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
@@ -159,6 +160,9 @@ id: 'aid'
 #deliverJobMaxAttempts: 12
 #inboxJobMaxAttempts: 8
 
+# Local address used for outgoing requests
+#outgoingAddress: 127.0.0.1
+
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
 

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "20.5.0"
+			"version": "20.5.1"
 		}
 	},
 	"forwardPorts": [3000],

.devcontainer/devcontainer.yml

@@ -114,6 +114,7 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@@ -121,7 +122,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!
 
-id: 'aid'
+id: 'aidx'
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────

.github/misskey/test.yml

@@ -12,4 +12,4 @@ db:
 redis:
   host: 127.0.0.1
   port: 56312
-id: aid
+id: aidx

.github/reviewer-lottery.yml

@@ -1,9 +0,0 @@
-groups:
-  - name: devs
-    reviewers: 2
-    internal_reviewers: 1
-    usernames:
-      - syuilo
-      - acid-chicken
-      - EbiseLutica
-      - tamaina

.github/workflows/api-misskey-js.yml

@@ -9,12 +9,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
 
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3.7.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'

.github/workflows/check_copyright_year.yml

@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
     - run: |
         if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
           echo "Please change copyright year!"

.github/workflows/docker-develop.yml

@@ -13,24 +13,24 @@ jobs:
     if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.1
+        uses: docker/setup-buildx-action@v3.0.0
         with:
           platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: misskey/misskey
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

.github/workflows/docker.yml

@@ -12,15 +12,15 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.1
+        uses: docker/setup-buildx-action@v3.0.0
         with:
           platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: misskey/misskey
           tags: |
@@ -31,12 +31,12 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

.github/workflows/dockle.yml

@@ -14,7 +14,7 @@ jobs:
     env:
       DOCKER_CONTENT_TRUST: 1
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.0.0
       - run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
           sudo dpkg -i dockle.deb

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
   pnpm_install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -19,7 +19,7 @@ jobs:
       with:
         version: 8
         run_install: false
-    - uses: actions/setup-node@v3.7.0
+    - uses: actions/setup-node@v3.8.1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -38,7 +38,7 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -46,7 +46,7 @@ jobs:
       with:
         version: 7
         run_install: false
-    - uses: actions/setup-node@v3.7.0
+    - uses: actions/setup-node@v3.8.1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -64,7 +64,7 @@ jobs:
         - backend
         - misskey-js
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -72,7 +72,7 @@ jobs:
       with:
         version: 7
         run_install: false
-    - uses: actions/setup-node@v3.7.0
+    - uses: actions/setup-node@v3.8.1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/ok-to-test.yml

@@ -17,7 +17,7 @@ jobs:
     # See app.yml for an example app manifest
     - name: Generate token
       id: generate_token
-      uses: tibdex/github-app-token@v1
+      uses: tibdex/github-app-token@v2
       with:
         app_id: ${{ secrets.DEPLOYBOT_APP_ID }}
         private_key: ${{ secrets.DEPLOYBOT_PRIVATE_KEY }}

.github/workflows/pr-preview-deploy.yml

@@ -53,7 +53,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v3.5.3
+      uses: actions/checkout@v4.0.0
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 

.github/workflows/reviewer_lottery.yml

@@ -1,13 +0,0 @@
-name: "Reviewer lottery"
-on:
-  pull_request_target:
-    types: [opened, ready_for_review, reopened]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3.5.3
-    - uses: uesteibar/reviewer-lottery@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/storybook.yml

@@ -1,112 +0,0 @@
-name: Storybook
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request_target:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    env:
-      NODE_OPTIONS: "--max_old_space_size=7168"
-
-    steps:
-    - uses: actions/checkout@v3.5.3
-      if: github.event_name != 'pull_request_target'
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: actions/checkout@v3.5.3
-      if: github.event_name == 'pull_request_target'
-      with:
-        fetch-depth: 0
-        submodules: true
-        ref: "refs/pull/${{ github.event.number }}/merge"
-    - name: Checkout actual HEAD
-      if: github.event_name == 'pull_request_target'
-      id: rev
-      run: |
-        echo "base=$(git rev-list --parents -n1 HEAD | cut -d" " -f2)" >> $GITHUB_OUTPUT
-        git checkout $(git rev-list --parents -n1 HEAD | cut -d" " -f3)
-    - name: Install pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 8
-        run_install: false
-    - name: Use Node.js 20.x
-      uses: actions/setup-node@v3.7.0
-      with:
-        node-version-file: '.node-version'
-        cache: 'pnpm'
-    - run: corepack enable
-    - run: pnpm i --frozen-lockfile
-    - name: Check pnpm-lock.yaml
-      run: git diff --exit-code pnpm-lock.yaml
-    - name: Build misskey-js
-      run: pnpm --filter misskey-js build
-    - name: Build storybook
-      run: pnpm --filter frontend build-storybook
-    - name: Publish to Chromatic
-      if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/master'
-      run: pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static
-      env:
-        CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    - name: Publish to Chromatic
-      if: github.event_name != 'pull_request_target' && github.ref != 'refs/heads/master'
-      id: chromatic_push
-      run: |
-        DIFF="${{ github.event.before }} HEAD"
-        if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
-          DIFF="HEAD"
-        fi
-        CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
-        if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
-          echo "skip=true" >> $GITHUB_OUTPUT
-        fi
-        if pnpm --filter frontend chromatic -d storybook-static $(echo "$CHROMATIC_PARAMETER"); then
-          echo "success=true" >> $GITHUB_OUTPUT
-        else
-          echo "success=false" >> $GITHUB_OUTPUT
-        fi
-      env:
-        CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    - name: Publish to Chromatic
-      if: github.event_name == 'pull_request_target'
-      id: chromatic_pull_request
-      run: |
-        DIFF="${{ steps.rev.outputs.base }} HEAD"
-        if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
-          DIFF="HEAD"
-        fi
-        CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
-        if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
-          echo "skip=true" >> $GITHUB_OUTPUT
-        fi
-        BRANCH="${{ github.event.pull_request.head.user.login }}:${{ github.event.pull_request.head.ref }}"
-        if [ "$BRANCH" = "misskey-dev:${{ github.event.pull_request.head.ref }}" ]; then
-          BRANCH="${{ github.event.pull_request.head.ref }}"
-        fi
-        pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static --branch-name $BRANCH $(echo "$CHROMATIC_PARAMETER")
-      env:
-        CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    - name: Notify that Chromatic detects changes
-      uses: actions/github-script@v6.4.0
-      if: github.event_name != 'pull_request_target' && steps.chromatic_push.outputs.success == 'false'
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          github.rest.repos.createCommitComment({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            commit_sha: context.sha,
-            body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).'
-          })
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: storybook
-        path: packages/frontend/storybook-static

.github/workflows/test-backend.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
 
     services:
       postgres:
@@ -29,7 +29,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm
@@ -38,7 +38,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.7.0
+      uses: actions/setup-node@v3.8.1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.github/workflows/test-frontend.yml

@@ -13,10 +13,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm
@@ -25,7 +25,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.7.0
+      uses: actions/setup-node@v3.8.1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
         browser: [chrome]
 
     services:
@@ -68,7 +68,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150
@@ -83,7 +83,7 @@ jobs:
         version: 7
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.7.0
+      uses: actions/setup-node@v3.8.1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -101,7 +101,7 @@ jobs:
     - name: Cypress install
       run: pnpm exec cypress install
     - name: Cypress run
-      uses: cypress-io/github-action@v5
+      uses: cypress-io/github-action@v6
       with:
         install: false
         start: pnpm start:test

.github/workflows/test-misskey-js.yml

@@ -16,17 +16,17 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
 
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3.7.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-production.yml

@@ -16,10 +16,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm
@@ -28,7 +28,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.7.0
+      uses: actions/setup-node@v3.8.1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.node-version

@@ -1 +1 @@
-20.5.0
+20.5.1

CHANGELOG.md

@@ -12,31 +12,85 @@
 
 -->
 
-## 2023.8.0 (unreleased)
+## 2023.9.0 (unreleased)
 
 ### General
-- OAuth 2.0のサポート
+- Feat: OAuth 2.0のサポート
-- お知らせ機能の強化
+- Feat: お知らせ機能の強化
 	- ユーザー個別のお知らせを作成可能に
 	- お知らせのバナー表示やダイアログ表示が可能に
 	- お知らせのアイコンを設定可能に
-- チャンネルをセンシティブ指定できるようになりました
+- Feat: チャンネルをセンシティブ指定できるようになりました
+	- センシティブチャンネルのNoteのReNoteはデフォルトでHome TLに流れるようになりました
+	- センシティブチャンネルのノートはユーザープロフィールに表示されません
+- Feat: 二要素認証のバックアップコードが生成されるようになりました
+	- ref. https://github.com/MisskeyIO/misskey/pull/121
+- Feat: 二要素認証でパスキーをサポートするようになりました
+- Feat: 指定したユーザーが投稿したときに通知できるようになりました
+- Feat: プロフィールでのリンク検証
+- Feat: 通知をテストできるようになりました
+- Feat: PWAのアイコンが設定できるようになりました
+- Enhance: 二要素認証設定時のセキュリティを強化
+	- パスワード入力が必要な操作を行う際、二要素認証が有効であれば確認コードの入力も必要になりました
+- Enhance: manifest.jsonをオーバーライド可能に
+- Enhance: 依存関係の更新
+- Enhance: ローカリゼーションの更新
 
 ### Client
-- メニューのスイッチの動作を改善
+- Feat: 任意のユーザーリストをタイムラインページにピン留めできるように
-- 絵文字ピッカーの検索の表示件数を100件に増加
+	- 設定->クライアント設定->全般 から設定可能です
+- Feat: Playで直接投稿フォームを埋め込めるように(`Ui:C:postForm`)
+- Feat: クライアントを起動している間、デバイスの画面が自動でオフになるのを防ぐオプションを追加
+- Feat: 新しい実績を追加
+- Enhance: ノート詳細ページでリノート一覧、リアクション一覧タブを追加
+	- ノートのメニューからは当該項目は消えました
+- Enhance: センシティブなメディアを目立たせる設定を追加
+- Enhance: プロフィールにその人が作ったPlayの一覧出せるように
+- Enhance: メニューのスイッチの動作を改善
+- Enhance: 絵文字ピッカーの検索の表示件数を100件に増加
+- Enhance: 投稿フォームのプレビューの表示状態を記憶するように
 - Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように
 - Enhance: 自分が押したリアクションのデザインを改善
+- Enhance: ノート検索にローカルのみ検索可能なオプションの追加
+- Enhance: Renote自体を通報できるように
+- Enhance: データセーバーモードの強化
+- Enhance: Renoteを管理者権限で削除可能に
+- Enhance: `$[rainbow ]`記法が、動きのあるMFMが無効になっていても使用できるようになりました
+- Enhance: Playの操作を行うAPI TokenをAPIコンソールから発行できるように
+- Enhance: リアクションの表示サイズをより大きくできるように
+- Enhance: AiScriptを0.16.0に更新
+- Enhance: AiScriptからMisskeyサーバーAPIを呼び出す際の制限を撤廃
+- Enhance: AiScriptで`LOCALE`として現在の設定言語を取得できるように
+- Enhance: Mk:apiが失敗した時にエラー型の値（AiScript 0.16.0で追加）を返すように
+- Enhance: ScratchpadでAsync:系関数やボタンのコールバックなどのエラーにもダイアログを出すように（試験的なためPlayなどには未実装）
+- Enhance: ノート詳細ページ読み込み時のパフォーマンスが向上しました
+- Enhance: タイムラインでリスト/アンテナ選択時のパフォーマンスを改善
+- Enhance: 「Moderation note」、「Add moderation note」をローカライズできるように
+- Enhance: 細かなデザインの調整
 - Fix: サーバー情報画面(`/instance-info/{domain}`)でブロックができないのを修正
 - Fix: 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正
 - Fix: iOSで画面を回転させるとテキストサイズが変わる問題を修正
+- Fix: word mute for sub note is not applied
 - Fix: タイムラインを下にスクロールしてノート画面に移動して再び戻ったら以前のスクロール位置を失う問題を修正
+- Fix: Misskeyプラグインをインストールする際のAiScriptバージョンのチェックが0.14.0以降に対応していない問題を修正
+- Fix: 他のサーバーのユーザーへ「メッセージを送信」した時の初期テキストのメンションが間違っている問題を修正
+- Fix: 環境によってはMisskey Webが開けない問題を修正
 
 ### Server
-- cacheRemoteFilesの初期値はfalseになりました
+- Change: cacheRemoteFilesの初期値はfalseになりました
-- ファイルアップロード時等にファイル名の拡張子を修正する関数(correctFilename)の挙動を改善
+- Enhance: ファイルアップロード時等にファイル名の拡張子を修正する関数(correctFilename)の挙動を改善
+- Enhance: Webhookのペイロードにサーバーのurlが含まれるようになりました
+- Enhance: Webhook設定でsecretを空に出来るように
+- Enhance: 使われていないアンテナの自動停止を設定可能に
+- Enhance: nodeinfo 2.1対応
+- Enhance: 自分へのメンション一覧を取得する際のパフォーマンスを向上
+- Enhance: Docker環境でjemallocを使用することでメモリ使用量を削減
+- Fix: MK_ONLY_SERVERオプションを指定した際にクラッシュする問題を修正
+- Fix: ノート検索 `notes/search` にてhostを指定した際に検索結果に反映されるように
 - Fix: 一部のfeatured noteを照会できない問題を修正
 - Fix: muteがapiからのuser list timeline取得で機能しない問題を修正
+- Fix: ジョブキュー管理画面の認証を回避できる問題を修正
+- Fix: 一部のサーバー内部エラーがスタックトレースを返さないように修正
 
 ## 13.14.2
 
@@ -51,6 +105,7 @@
 ### Server
 - Fix: APIのオフセットが壊れていたせいで「もっと見る」でもっと見れない問題を修正
 - Fix: 外部サーバーの投稿がタイムラインに表示されないことがある問題を修正
+- Enhance: Add address bind config option (outgoingAddress)
 
 ## 13.14.1
 

CONTRIBUTING.md

@@ -301,6 +301,12 @@ export const handlers = [
 Don't forget to re-run the `.storybook/generate.js` script after adding, editing, or removing the above files.
 
 ## Notes
+
+### Misskeyのドメイン固有の概念は`Mi`をprefixする
+例えばGoogleが自社サービスをMap、Earth、DriveではなくGoogle Map、Google Earth、Google Driveのように命名するのと同じ
+コード上でMisskeyのドメイン固有の概念には`Mi`をprefixすることで、他のドメインの同様の概念と区別できるほか、名前の衝突を防ぐ。
+ただし、文脈上Misskeyのものを指すことが明らかであり、名前の衝突の恐れがない場合は、一時的なローカル変数に限って`Mi`を省略してもよい。
+
 ### How to resolve conflictions occurred at pnpm-lock.yaml?
 
 Just execute `pnpm` to fix it.
@@ -430,3 +436,6 @@ marginはそのコンポーネントを使う側が設定する
 ## その他
 ### HTMLのクラス名で follow という単語は使わない
 広告ブロッカーで誤ってブロックされる
+
+### indexというファイル名を使うな
+ESMではディレクトリインポートは廃止されているのと、ディレクトリインポートせずともファイル名が index だと何故か一部のライブラリ？でディレクトリインポートだと見做されてエラーになる

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=20.5.0-bullseye
+ARG NODE_VERSION=20.5.1-bullseye
 
 # build assets & compile TypeScript
 
@@ -62,7 +62,8 @@ ARG GID="991"
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
-	ffmpeg tini curl \
+	ffmpeg tini curl libjemalloc-dev libjemalloc2 \
+	&& ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \
 	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
@@ -81,6 +82,7 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/bui
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./
 
+ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so
 ENV NODE_ENV=production
 HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]

chart/files/default.yml

@@ -135,6 +135,7 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@@ -142,7 +143,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!
 
-id: "aid"
+id: "aidx"
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
 

docker-compose.yml.example

@@ -50,7 +50,7 @@ services:
 
 #  meilisearch:
 #    restart: always
-#    image: getmeili/meilisearch:v1.1.1
+#    image: getmeili/meilisearch:v1.3.4
 #    environment:
 #      - MEILI_NO_ANALYTICS=true
 #      - MEILI_ENV=production

gulpfile.mjs

@@ -1,65 +0,0 @@
-/**
- * Gulp tasks
- */
-
-import * as fs from 'node:fs';
-import gulp from 'gulp';
-import replace from 'gulp-replace';
-import terser from 'gulp-terser';
-import cssnano from 'gulp-cssnano';
-
-import locales from './locales/index.js';
-import meta from './package.json' assert { type: "json" };
-
-gulp.task('copy:backend:views', () =>
-	gulp.src('./packages/backend/src/server/web/views/**/*').pipe(gulp.dest('./packages/backend/built/server/web/views'))
-);
-
-gulp.task('copy:frontend:fonts', () =>
-	gulp.src('./packages/frontend/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_frontend_dist_/fonts/'))
-);
-
-gulp.task('copy:frontend:tabler-icons', () =>
-	gulp.src('./packages/frontend/node_modules/@tabler/icons-webfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
-);
-
-gulp.task('copy:frontend:locales', cb => {
-	fs.mkdirSync('./built/_frontend_dist_/locales', { recursive: true });
-
-	const v = { '_version_': meta.version };
-
-	for (const [lang, locale] of Object.entries(locales)) {
-		fs.writeFileSync(`./built/_frontend_dist_/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
-	}
-
-	cb();
-});
-
-gulp.task('build:backend:script', () => {
-	return gulp.src(['./packages/backend/src/server/web/boot.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js'])
-		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
-		.pipe(terser({
-			toplevel: true
-		}))
-		.pipe(gulp.dest('./packages/backend/built/server/web/'));
-});
-
-gulp.task('build:backend:style', () => {
-	return gulp.src(['./packages/backend/src/server/web/style.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css', './packages/backend/src/server/web/error.css'])
-		.pipe(cssnano({
-			zindex: false
-		}))
-		.pipe(gulp.dest('./packages/backend/built/server/web/'));
-});
-
-gulp.task('build', gulp.parallel(
-	'copy:frontend:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:frontend:fonts', 'copy:frontend:tabler-icons'
-));
-
-gulp.task('default', gulp.task('build'));
-
-gulp.task('watch', () => {
-	gulp.watch([
-		'./packages/*/src/**/*',
-	], { ignoreInitial: false }, gulp.task('build'));
-});

locales/ar-SA.yml

@@ -348,7 +348,6 @@ invite: "دعوة"
 driveCapacityPerLocalAccount: "حصة التخزين لكل مستخدم محلي"
 driveCapacityPerRemoteAccount: "حصة التخزين لكل مستخدم بعيد"
 inMb: "بالميغابايت"
-iconUrl: "رابط الأيقونة"
 bannerUrl: "رابط صورة اللافتة"
 backgroundImageUrl: "رابط صورة الخلفية"
 basicInfo: "المعلومات الأساسية "
@@ -645,6 +644,7 @@ optional: "اختياري"
 createNewClip: "أنشئ مِشبكَا جديدًا"
 confirmToUnclipAlreadyClippedNote: "هذه الملاحظة تنتمي للمشبك {name} سلفًا، أتريد حذفها منه⸮"
 public: "علني"
+private: "خاص"
 i18nInfo: "يترجم متطوعون ميسكي إلى عدة لغات، يمكنك المساعدة عبر {link}"
 manageAccessTokens: "إدارة رموز الوصول"
 accountInfo: "معلومات الحساب"
@@ -798,6 +798,7 @@ accountDeletionInProgress: "حذف الحساب جارٍ"
 usernameInfo: "الاسم الذي يميزك عن بافي مستخدمي هذا الخادم، يمكنك استخدام الحروف اللاتينية (a~z, A~Z) والأرقام (0~9) والشرطة السفلية (_). لا يمكنك تغييره بعد تسجيله."
 devMode: "وضع المُطوّر"
 keepCw: "أبقِ على تحذيرات المحتوى"
+pubSub: "حسابات Pub/Sub"
 lastCommunication: "آخر تواصل"
 resolved: "عولج"
 unresolved: "لم يعالج"
@@ -806,6 +807,7 @@ breakFollowConfirm: "أمتأكد من إزالة المتابِع ؟"
 itsOn: "مفعّل"
 itsOff: "معطّل"
 on: "مفعل"
+off: "معطل"
 emailRequiredForSignup: "عنوان البريد الإلكتروني إلزامي للتسجيل"
 unread: "غير مقروءة"
 filter: "رشّح"
@@ -852,6 +854,7 @@ recentNDays: "آخر {n} أيام"
 noEmailServerWarning: "خادم البريد غير مضبوط."
 thereIsUnresolvedAbuseReportWarning: "توجد بلاغات غير معالجة."
 recommended: "مقترح"
+check: "التحقق"
 driveCapOverrideLabel: "غيّر حجم قرص التخزين لهذا المستخدم"
 driveCapOverrideCaption: "أعد الحجم إلى القيمة الافتراضية بإدخال 0 أو أقل."
 requireAdminForView: "لاستعراض هذه الصفحة وجب عليك الولوج كمدير."
@@ -875,6 +878,7 @@ slow: "بطيء"
 fast: "سريع"
 sensitiveMediaDetection: "التعرف على المحتوى الحساس"
 localOnly: "المحلي فقط"
+remoteOnly: "بُعدي فقط"
 failedToUpload: "فشل الرفع"
 cannotUploadBecauseInappropriate: "تعذر رفع الملف لوجود محتوى حساس فيه."
 cannotUploadBecauseNoFreeSpace: "تعذر رفع الملف لنقص مساحة التخزين."
@@ -894,6 +898,7 @@ pushNotificationAlreadySubscribed: "إرسال الإشعارات مفعل سل
 pushNotificationNotSupported: "متصفحك لا يدعم إرسال الإشعارات أو المثيل لا يدعمها."
 sendPushNotificationReadMessage: "احذف الإشعارات فور قراءتها"
 sendPushNotificationReadMessageCaption: "هذا قد يزيد من معدل استهلاك الطاقة لجهازك."
+windowMaximize: "املأ الشاشة"
 windowRestore: "استرجاع"
 caption: "التعليق التوضيحي"
 loggedInAsBot: "والج كآلي"
@@ -951,6 +956,8 @@ accountMoved: "نقل هذا المستخدم حسابه:"
 accountMovedShort: "رُحل هذا الحساب."
 operationForbidden: "عملية ممنوعة"
 forceShowAds: "أظهر الإعلانات التجارية دائما"
+reactionsList: "التفاعلات"
+renotesList: "إعادات النشر"
 leftTop: "أعلى اليسار"
 rightTop: "أعلى اليمين"
 leftBottom: "أسفل اليسار"
@@ -986,6 +993,12 @@ later: "لاحقاً"
 goToMisskey: "لميسكي"
 additionalEmojiDictionary: "قواميس إيموجي إضافية"
 installed: "مُثبت"
+expirationDate: "تاريخ انتهاء الصلاحية"
+unused: "غير مستعمَل"
+expired: "منتهية صلاحيته"
+icon: "الصورة الرمزية"
+replies: "رد"
+renotes: "أعد النشر"
 _initialAccountSetting:
   accountCreated: "نجح إنشاء حسابك!"
   letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
@@ -1071,6 +1084,7 @@ _role:
   description: "وصف الدور"
   permission: "أذونات الدور"
   assignTarget: "نوع الإسناد"
+  condition: "الشرط"
   options: "خيارات"
   policies: "السياسة العامة"
   priority: "الأولوية"
@@ -1126,6 +1140,9 @@ _plugin:
   install: "ثبّت إضافات"
   installWarn: "رجاءً لا تثبت إضافات غير موثوقة."
   manage: "إدارة الإضافات"
+_preferencesBackups:
+  createdAt: "تم إنشاؤه: {date} {time}"
+  updatedAt: "آخر تحديث: {date} {time}"
 _registry:
   scope: "الحيّز"
   key: "مفتاح"
@@ -1250,6 +1267,9 @@ _time:
   minute: "د"
   hour: "سا"
   day: "ي"
+_timelineTutorial:
+  title: "كيف تستخدم Misskey"
+  step3_1: "هل نشرت ملاحظتك الأولى؟"
 _2fa:
   alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
   step1: "أولًا ثبّت تطبيق استيثاق على جهازك (مثل {a} و{b})."
@@ -1487,22 +1507,22 @@ _notification:
   fileUploaded: "نجح رفع الملف"
   youGotMention: "{name} أشار إليك"
   youGotReply: "ردّ عليك {name}"
-  youGotQuote: "اقتبس منك {name}"
+  youGotQuote: "اقتبس {name} منشورك"
-  youRenoted: "إعادت نشر من {name}"
+  youRenoted: "أعاد {name} نشر منشورك"
   youWereFollowed: "يتابعك"
   youReceivedFollowRequest: "تلقيتَ طلب متابعة"
   yourFollowRequestAccepted: "قُبل طلب المتابعة"
-  pollEnded: "ظهرت نتائج الاستطلاع"
+  pollEnded: "انتهى الاستطلاع"
   unreadAntennaNote: "هوائي {name}"
   _types:
     all: "الكل"
     follow: "متابِعون جدد"
     mention: "الإشارات"
     reply: "الردود"
-    renote: "أعد النشر"
+    renote: "أعاد النشر"
     quote: "الاقتباسات"
-    reaction: "التفاعلات"
+    reaction: "التفاعل"
-    receiveFollowRequest: "طلبات المتابعة المتلقاة"
+    receiveFollowRequest: "طلبات المتابعة"
     followRequestAccepted: "طلبات المتابعة المقبولة"
     app: "إشعارات التطبيقات المرتبطة"
   _actions:
@@ -1510,26 +1530,28 @@ _notification:
     reply: "رد"
     renote: "أعد النشر"
 _deck:
-  alwaysShowMainColumn: "أظهر العمود الرئيسي دائمًا"
+  alwaysShowMainColumn: "أظهر العمود الأساسي دائمًا"
-  columnAlign: "حاذِ الأعمدة"
+  columnAlign: "محاذاة الأعمدة"
-  addColumn: "أضف عمودًا"
+  addColumn: "إضافة عمود"
-  swapLeft: "حرّك لليسار"
+  swapLeft: "التحريك إلى اليسار"
-  swapRight: "حرّك لليمين"
+  swapRight: "التحريك إلى اليمين"
-  swapUp: "حرّك لأعلى"
+  swapUp: "التحريك إلى الأعلى"
-  swapDown: "حرّك لأسفل"
+  swapDown: "التحريك إلى الأسفل"
-  profile: "الملف الشخصي"
+  profile: "حسابي الشخصي"
+  newProfile: "ملف تعريفي جديد"
+  deleteProfile: "حذف الملف التعريفي"
   _columns:
-    main: "الرئيسي"
+    main: "الرئيسية"
-    widgets: "الودجات"
+    widgets: "التطبيقات المُصغّرة"
     notifications: "الإشعارات"
-    tl: "الخيط الزمني"
+    tl: "الخط الزمني"
     antenna: "الهوائيات"
     list: "القوائم"
     channel: "القنوات"
     mentions: "الإشارات"
     direct: "مباشرة"
 _webhookSettings:
-  name: "الإسم"
+  name: "الاسم"
-  active: "مفعّل"
+  active: "مُفعّل"
   _events:
-    reaction: "عند تلقي تفاعل"
+    reaction: "عند التفاعل"

locales/bn-BD.yml

@@ -328,7 +328,6 @@ invite: "আমন্ত্রণ"
 driveCapacityPerLocalAccount: "প্রত্যেক স্থানীয় ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
 driveCapacityPerRemoteAccount: "প্রত্যেক রিমোট ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
 inMb: "মেগাবাইটে লিখুন"
-iconUrl: "আইকনের URL (ফ্যাভিকন, ইত্যাদি)"
 bannerUrl: "ব্যানার ছবির URL"
 backgroundImageUrl: "পটভূমির চিত্রের URL"
 basicInfo: "আপনার ব্যক্তিগত তথ্য"
@@ -628,6 +627,7 @@ createNew: "নতুন"
 optional: "প্রয়োজনীয় নয়"
 createNewClip: "নতুন ক্লিপ তৈরি করুন"
 public: "সর্বজনীন"
+private: "ব্যাক্তিগত"
 i18nInfo: "Misskey স্বেচ্ছাসেবকদের দ্বারা বিভিন্ন ভাষায় অনুবাদ করা হচ্ছে। আপনি {link} এ গিয়ে অনুবাদে সহযোগিতা করতে পারেন।"
 manageAccessTokens: "অ্যাক্সেস টোকেন পরিচালনা করুন"
 accountInfo: "অ্যাকাউন্টের তথ্য"
@@ -837,6 +837,9 @@ show: "প্রদর্শন"
 color: "রং"
 horizontal: "পাশে"
 youFollowing: "অনুসরণ করা হচ্ছে"
+icon: "প্রোফাইল ছবি"
+replies: "জবাব"
+renotes: "রিনোট"
 _role:
   priority: "অগ্রাধিকার"
   _priority:
@@ -1040,7 +1043,6 @@ _2fa:
   alreadyRegistered: "আপনি ইতিমধ্যে একটি 2-ফ্যাক্টর অথেনটিকেশন ডিভাইস নিবন্ধন করেছেন৷"
   step1: "প্রথমে, আপনার ডিভাইসে {a} বা {b} এর মতো একটি অথেনটিকেশন অ্যাপ ইনস্টল করুন৷"
   step2: "এরপরে, অ্যাপের সাহায্যে প্রদর্শিত QR কোডটি স্ক্যান করুন।"
-  step2Url: "ডেস্কটপ অ্যাপে, নিম্নলিখিত URL লিখুন:"
   step3: "অ্যাপে প্রদর্শিত টোকেনটি লিখুন এবং আপনার কাজ শেষ।"
   step4: "আপনাকে এখন থেকে লগ ইন করার সময়, এইভাবে টোকেন লিখতে হবে।"
   securityKeyInfo: "আপনি একটি হার্ডওয়্যার সিকিউরিটি কী ব্যবহার করে লগ ইন করতে পারেন যা FIDO2 বা ডিভাইসের ফিঙ্গারপ্রিন্ট সেন্সর বা পিন সমর্থন করে৷"

locales/ca-ES.yml

@@ -13,12 +13,14 @@ fetchingAsApObject: "Cercant en el Fediverse..."
 ok: "OK"
 gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
+noThankYou: "No, gràcies"
 enterUsername: "Introdueix el teu nom d'usuari"
 renotedBy: "Impulsat per {usuari}"
 noNotes: "Cap nota"
 noNotifications: "Cap notificació"
 instance: "Servidor"
 settings: "Preferències"
+notificationSettings: "Paràmetres de notificacions"
 basicSettings: "Configuració bàsica"
 otherSettings: "Configuració avançada"
 openInWindow: "Obrir en una nova finestra"
@@ -47,8 +49,15 @@ delete: "Elimina"
 deleteAndEdit: "Elimina i edita"
 deleteAndEditConfirm: "Segur que vols eliminar aquesta publicació i editar-la? Perdràs totes les reaccions, impulsos i respostes."
 addToList: "Afegir a una llista"
+addToAntenna: "Afegir a l'antena"
 sendMessage: "Enviar un missatge"
+copyRSS: "Copiar RSS"
 copyUsername: "Copiar nom d'usuari"
+copyUserId: "Copiar ID d'usuari"
+copyNoteId: "Copiar ID de nota"
+copyFileId: "Copiar ID d'arxiu"
+copyFolderId: "Copiar ID de carpeta"
+copyProfileUrl: "Copiar URL del perfil"
 searchUser: "Cercar un usuari"
 reply: "Respondre"
 loadMore: "Carregar més"
@@ -128,6 +137,7 @@ suspendConfirm: "Estàs segur que vols suspendre aquest compte?"
 unsuspendConfirm: "Estàs segur que vols treure la suspensió d'aquest compte?"
 selectList: "Tria una llista"
 selectAntenna: "Tria una antena"
+editAntenna: "Modificar antena"
 selectWidget: "Triar un giny"
 editWidgets: "Editar ginys"
 editWidgetsExit: "Fet"
@@ -298,8 +308,10 @@ manageAntennas: "Gestiona les antenes"
 antennaSource: "Font de l'antena"
 antennaKeywords: "Paraules clau a seguir"
 antennaExcludeKeywords: "Paraules clau a excloure"
+antennaKeywordsDescription: "Separar amb espais per la condició AND o amb salts de línia per la condició OR."
 notifyAntenna: "Notifica'm les publicacions noves"
 withFileAntenna: "Només les publicacions amb fitxers"
+antennaUsersDescription: "Llistar un nom d'usuari per línia"
 notesAndReplies: "Amb respostes"
 silence: "Silencia"
 silenceConfirm: "Segur que vols silenciar aquest usuari?"
@@ -369,6 +381,11 @@ user: "Usuaris"
 global: "Global"
 searchByGoogle: "Cercar"
 file: "Fitxers"
+replies: "Respondre"
+renotes: "Impulsa"
+_role:
+  _options:
+    antennaMax: "Nombre màxim d'antenes"
 _email:
   _follow:
     title: "t'ha seguit"
@@ -384,7 +401,7 @@ _sfx:
   chat: "Xat"
   antenna: "Antenes"
 _2fa:
-  step2Url: "També pots inserir aquest enllaç i utilitzes una aplicació d'escriptori:"
+  renewTOTPCancel: "No, gràcies"
 _antennaSources:
   all: "Totes les publicacions"
   homeTimeline: "Publicacions dels usuaris seguits"
@@ -430,6 +447,7 @@ _pages:
 _notification:
   youRenoted: "Impulsat per {name}"
   youWereFollowed: "t'ha seguit"
+  unreadAntennaNote: "Antena {name}"
   _types:
     all: "Tots"
     follow: "Seguint"

locales/de-DE.yml

@@ -45,6 +45,7 @@ pin: "An dein Profil anheften"
 unpin: "Von deinem Profil lösen"
 copyContent: "Inhalt kopieren"
 copyLink: "Link kopieren"
+copyLinkRenote: "Renote-Link kopieren"
 delete: "Löschen"
 deleteAndEdit: "Löschen und Bearbeiten"
 deleteAndEditConfirm: "Möchtest du diese Notiz wirklich löschen und bearbeiten? Alle Reaktionen, Renotes und Antworten dieser Notiz werden verloren gehen."
@@ -156,6 +157,7 @@ addEmoji: "Emoji hinzufügen"
 settingGuide: "Empfohlene Einstellung"
 cacheRemoteFiles: "Dateien von fremden Instanzen im Cache speichern"
 cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite verwendet."
+youCanCleanRemoteFilesCache: "Klicke auf den 🗑️-Knopf der Dateiverwaltungsansicht, um den Cache zu leeren."
 cacheRemoteSensitiveFiles: "Sensitive Dateien von fremden Instanzen im Cache speichern"
 cacheRemoteSensitiveFilesDescription: "Ist diese Einstellung deaktiviert, so werden sensitive Dateien fremder Instanzen direkt von dort ohne Zwischenspeicherung geladen."
 flagAsBot: "Als Bot markieren"
@@ -230,7 +232,7 @@ noJobs: "Keine Jobs vorhanden"
 federating: "Wird föderiert"
 blocked: "Blockiert"
 suspended: "Gesperrt"
-all: "Alles"
+all: "Alle"
 subscribing: "Wird abonniert"
 publishing: "Wird veröffentlicht"
 notResponding: "Antwortet nicht"
@@ -319,7 +321,7 @@ copyUrl: "URL kopieren"
 rename: "Umbenennen"
 avatar: "Profilbild"
 banner: "Banner"
-displayOfSensitiveMedia: "Anzeige von sensiblen Medien"
+displayOfSensitiveMedia: "Darstellung sensibler Medien"
 whenServerDisconnected: "Bei Verbindungsverlust zum Server"
 disconnectedFromServer: "Die Verbindung zum Server wurde getrennt"
 reload: "Aktualisieren"
@@ -354,7 +356,6 @@ invite: "Einladen"
 driveCapacityPerLocalAccount: "Drive-Kapazität pro lokalem Benutzerkonto"
 driveCapacityPerRemoteAccount: "Drive-Kapazität pro Benutzer fremder Instanzen"
 inMb: "In Megabytes"
-iconUrl: "Icon-URL (favicon etc)"
 bannerUrl: "Banner-URL"
 backgroundImageUrl: "Hintergrundbild-URL"
 basicInfo: "Grundlegende Informationen"
@@ -410,13 +411,16 @@ aboutMisskey: "Über Misskey"
 administrator: "Administrator"
 token: "Token"
 2fa: "Zwei-Faktor-Authentifizierung"
+setupOf2fa: "Zweifaktorauthentifizierung einrichten"
 totp: "Authentifizierungs-App"
 totpDescription: "Logge dich via Authentifizierungs-App mit Einmalpasswort ein"
 moderator: "Moderator"
 moderation: "Moderation"
+moderationNote: "Moderationsnotiz"
+addModerationNote: "Moderationsnotiz hinzufügen"
 nUsersMentioned: "Von {n} Benutzern erwähnt"
-securityKeyAndPasskey: "Security-Tokens und Passkeys"
+securityKeyAndPasskey: "Hardware-Sicherheitsschlüssel und Passkeys"
-securityKey: "Sicherheitsschlüssel"
+securityKey: "Hardware-Sicherheitsschlüssel"
 lastUsed: "Zuletzt benutzt"
 lastUsedAt: "Zuletzt verwendet: {t}"
 unregister: "Deaktivieren"
@@ -540,7 +544,7 @@ chooseEmoji: "Emoji auswählen"
 unableToProcess: "Der Vorgang konnte nicht abgeschlossen werden"
 recentUsed: "Vor kurzem verwendet"
 install: "Installieren"
-uninstall: "Uninstallieren"
+uninstall: "Deinstallieren"
 installedApps: "Authorisierte Anwendungen"
 nothing: "Hier gibt es nichts zu sehen"
 installedDate: "Authorisiert am"
@@ -631,7 +635,7 @@ regexpErrorDescription: "Im regulären Ausdruck deiner {tab}en Wortstummschaltun
 instanceMute: "Instanzstummschaltungen"
 userSaysSomething: "{name} hat etwas gesagt"
 makeActive: "Aktivieren"
-display: "Anzeigen"
+display: "Anzeigeart"
 copy: "Kopieren"
 metrics: "Metriken"
 overview: "Übersicht"
@@ -653,6 +657,7 @@ behavior: "Verhalten"
 sample: "Beispiel"
 abuseReports: "Meldungen"
 reportAbuse: "Melden"
+reportAbuseRenote: "Renote melden"
 reportAbuseOf: "{name} melden"
 fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
 abuseReported: "Deine Meldung wurde versendet. Vielen Dank."
@@ -680,6 +685,7 @@ createNewClip: "Neuen Clip erstellen"
 unclip: "Aus Clip entfernen"
 confirmToUnclipAlreadyClippedNote: "Diese Notiz ist bereits im \"{name}\" Clip enthalten. Möchtest du sie aus diesem Clip entfernen?"
 public: "Öffentlich"
+private: "Privat"
 i18nInfo: "Misskey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
 manageAccessTokens: "Zugriffstokens verwalten"
 accountInfo: "Benutzerkonto-Informationen"
@@ -1018,7 +1024,7 @@ retryAllQueuesConfirmText: "Dies wird zu einer temporären Erhöhung der Serverl
 enableChartsForRemoteUser: "Diagramme für Nutzer fremder Instanzen erstellen"
 enableChartsForFederatedInstances: "Diagramme für fremde Instanzen erstellen"
 showClipButtonInNoteFooter: "\"Clip\" zum Notizmenu hinzufügen"
-largeNoteReactions: "Reaktionen vergrößert anzeigen"
+reactionsDisplaySize: "Reaktionsanzeigegröße"
 noteIdOrUrl: "Notiz-ID oder URL"
 video: "Video"
 videos: "Videos"
@@ -1052,7 +1058,7 @@ archive: "Archivieren"
 channelArchiveConfirmTitle: "{name} wirklich archivieren?"
 channelArchiveConfirmDescription: "Ein archivierter Kanal taucht nicht mehr in der Kanalliste oder in Suchergebnissen auf. Zudem können ihm keine Beiträge mehr hinzugefügt werden."
 thisChannelArchived: "Dieser Kanal wurde archiviert."
-displayOfNote: "Anzeige von Notizen"
+displayOfNote: "Darstellung von Notizen"
 initialAccountSetting: "Kontoeinrichtung"
 youFollowing: "Gefolgt"
 preventAiLearning: "Verwendung in machinellem Lernen (Generative bzw. Prediktive AI/KI) ablehnen"
@@ -1094,6 +1100,27 @@ expired: "Abgelaufen"
 doYouAgree: "Zustimmen?"
 beSureToReadThisAsItIsImportant: "Lies bitte diese wichtige Informationen."
 iHaveReadXCarefullyAndAgree: "Ich habe den Text \"{x}\" gelesen und stimme zu."
+dialog: "Dialogfeld"
+icon: "Symbol"
+forYou: "Für dich"
+currentAnnouncements: "Aktuelle Ankündigungen"
+pastAnnouncements: "Alte Ankündigungen"
+youHaveUnreadAnnouncements: "Es gibt neue Ankündigungen."
+useSecurityKey: "Folge bitten den Anweisungen deines Browsers bzw. Gerätes und verwende deinen Hardware-Sicherheitsschlüssel oder Passkey."
+replies: "Antworten"
+renotes: "Renotes"
+loadReplies: "Antworten anzeigen"
+loadConversation: "Unterhaltung anzeigen"
+pinnedList: "Angeheftete Liste"
+_announcement:
+  forExistingUsers: "Nur für existierende Nutzer"
+  forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt."
+  needConfirmationToRead: "Separate Lesebestätigung erfordern"
+  needConfirmationToReadDescription: "Ist dies aktiviert, so wird beim Markieren dieser Ankündigung als gelesen ein separates Bestätigungsfenster angezeigt. Auch wird sie von der \"Alle als gelesen markieren\"-Funktion ausgenommen."
+  end: "Ankündigung archivieren"
+  tooManyActiveAnnouncementDescription: "Zu viele aktive Ankündigungen können die Benutzerfreundlichkeit verschlechtern. Es wird empfohlen, veraltete Ankündigungen zu archivieren."
+  readConfirmTitle: "Als gelesen markieren?"
+  readConfirmText: "Dies markiert den Inhalt von \"{title}\" als gelesen."
 _initialAccountSetting:
   accountCreated: "Dein Konto wurde erfolgreich erstellt!"
   letsStartAccountSetup: "Lass uns nun dein Konto einrichten."
@@ -1111,6 +1138,13 @@ _initialAccountSetting:
   laterAreYouSure: "Die Kontoeinrichtung wirklich später erledigen?"
 _serverRules:
   description: "Eine Reihe von Regeln, die vor der Registrierung angezeigt werden. Eine Zusammenfassung der Nutzungsbedingungen anzuzeigen ist empfohlen."
+_serverSettings:
+  iconUrl: "Icon-URL"
+  appIconDescription: "Gibt das zu verwendende Icon bei der Anzeige von {host} als App an."
+  appIconUsageExample: "Beispielsweise als PWA, oder bei Lesezeichen auf dem Startbildschirm von Smartphones"
+  appIconStyleRecommendation: "Da das Icon zu einem Kreis oder Quadrat zugeschnitten wird, wird ein Icon mit gefülltem Margin um den Inhalt herum empfohlen."
+  appIconResolutionMustBe: "Die Mindestauflösung ist {resolution}."
+  manifestJsonOverride: "Überschreiben von manifest.json"
 _accountMigration:
   moveFrom: "Von einem anderen Konto zu diesem migrieren"
   moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1365,6 +1399,9 @@ _achievements:
       title: "Brain Diver"
       description: "Sende den Link zu Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "Testüberfluss"
+      description: "Betätige den Benachrichtigungstest mehrfach innerhalb einer extrem kurzen Zeitspanne"
 _role:
   new: "Rolle erstellen"
   edit: "Rolle bearbeiten"
@@ -1679,15 +1716,15 @@ _2fa:
   step1: "Installiere zuerst eine Authentifizierungsapp (z.B. {a} oder {b}) auf deinem Gerät."
   step2: "Dann, scanne den angezeigten QR-Code mit deinem Gerät."
   step2Click: "Durch Klicken dieses QR-Codes kannst du Verifikation mit deinem Security-Token oder einer App registrieren."
-  step2Url: "Nutzt du ein Desktopprogramm kannst du alternativ diese URL eingeben:"
+  step2Uri: "Nutzt du ein Desktopprogramm, gib folgende URI eingeben"
   step3Title: "Authentifizierungsscode eingeben"
   step3: "Gib zum Abschluss den Token ein, der von deiner App angezeigt wird."
+  setupCompleted: "Einrichtung abgeschlossen"
   step4: "Alle folgenden Anmeldeversuche werden ab sofort die Eingabe eines solchen Tokens benötigen."
-  securityKeyNotSupported: "Dein Browser unterstützt keine Security-Tokens."
+  securityKeyNotSupported: "Dein Browser unterstützt keine Hardware-Sicherheitsschlüssel."
   registerTOTPBeforeKey: "Um einen Security-Token oder einen Passkey zu registrieren, musst du zuerst eine Authentifizierungs-App registrieren."
   securityKeyInfo: "Du kannst neben Fingerabdruck- oder PIN-Authentifizierung auf deinem Gerät auch Anmeldung mit Hilfe eines FIDO2-kompatiblen Hardware-Sicherheitsschlüssels einrichten."
-  chromePasskeyNotSupported: "Chrome-Passkeys werden zur Zeit nicht unterstützt."
+  registerSecurityKey: "Hardware-Sicherheitsschlüssel oder Passkey registrieren"
-  registerSecurityKey: "Security-Token oder Passkey registrieren"
   securityKeyName: "Schlüsselname eingeben"
   tapSecurityKey: "Bitten folge den Anweisungen deines Browsers zur Registrierung"
   removeKey: "Sicherheitsschlüssel entfernen"
@@ -1697,6 +1734,11 @@ _2fa:
   renewTOTPConfirm: "Codes der bisherigen App werden hierdurch nutzlos"
   renewTOTPOk: "Neu einrichten"
   renewTOTPCancel: "Abbrechen"
+  checkBackupCodesBeforeCloseThisWizard: "Notiere bitte deine Backup-Codes, bevor du dieses Fenster schließt."
+  backupCodes: "Backup-Codes"
+  backupCodesDescription: "Verwende diese Codes, falls du nicht mehr auf deine App zur Zweifaktorauthentifizierung zugreifen kannst. Jeder Code kann nur einmal verwendet werden. Bewahre sie an einem sicheren Ort auf."
+  backupCodeUsedWarning: "Ein Backup-Code wurde verwendet. Falls du den Zugriff zu deiner Zweifaktorauthentifizierungsapp verloren hast, konfiguriere diese bitte möglichst bald erneut."
+  backupCodesExhaustedWarning: "Alle Backup-Codes wurden verwendet. Falls du den Zugang zu deiner Zweifaktorauthentifizierungsapp verlierst, wirst du dich nicht mehr in dieses Konto einloggen können. Bitte konfiguriere diese App erneut."
 _permissions:
   "read:account": "Deine Benutzerkontoinformationen lesen"
   "write:account": "Deine Benutzerkontoinformationen bearbeiten"
@@ -1730,6 +1772,10 @@ _permissions:
   "write:gallery": "Deine Galerie bearbeiten"
   "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge lesen"
   "write:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge bearbeiten"
+  "read:flash": "Deine Plays lesen"
+  "write:flash": "Deine Plays bearbeiten oder löschen"
+  "read:flash-likes": "Liste der Plays, die mir gefallen, lesen"
+  "write:flash-likes": "Liste der Plays, die mir gefallen, bearbeiten"
 _auth:
   shareAccessTitle: "Verteilung von App-Berechtigungen"
   shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
@@ -1965,6 +2011,10 @@ _notification:
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Push-Benachrichtigungen wurden aktualisiert"
   achievementEarned: "Errungenschaft freigeschaltet"
+  testNotification: "Testbenachrichtigung"
+  checkNotificationBehavior: "Aussehen von Benachrichtigungen überprüfen"
+  sendTestNotification: "Testbenachrichtigung senden"
+  notificationWillBeDisplayedLikeThis: "Benachrichtigungen sehen so aus"
   _types:
     all: "Alle"
     follow: "Neue Follower"
@@ -2000,6 +2050,8 @@ _deck:
   introduction2: "Klicke auf das + rechts um wann immer du möchtest neue Spalten hinzuzufügen."
   widgetsIntroduction: "Drücke bitte \"Widgets bearbeiten\" im Spaltenmenü und füge ein Widget hinzu."
   useSimpleUiForNonRootPages: "Simple Benutzeroberfläche für navigierte Seiten verwenden"
+  usedAsMinWidthWhenFlexible: "Ist \"Automatische Breitenanpassung\" aktiviert, wird hierfür die minimale Breite verwendet"
+  flexible: "Automatische Breitenanpassung"
   _columns:
     main: "Hauptspalte"
     widgets: "Widgets"

locales/el-GR.yml

@@ -287,6 +287,9 @@ searchByGoogle: "Αναζήτηση"
 file: "Αρχεία"
 recommended: "Προτεινόμενα"
 cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω ανεπαρκούς Αποθηκευτικού Χώρου"
+icon: "Εικονίδιο"
+replies: "Απάντηση"
+renotes: "Κοινοποίηση σημειώματος"
 _email:
   _follow:
     title: "Έχετε ένα νέο ακόλουθο"

locales/en-US.yml

@@ -45,9 +45,10 @@ pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
 copyLink: "Copy link"
+copyLinkRenote: "Copy renote link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
-deleteAndEditConfirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
+deleteAndEditConfirm: "Are you sure you want to redraft this note? This means you will lose all reactions, renotes, and replies to it."
 addToList: "Add to list"
 addToAntenna: "Add to antenna"
 sendMessage: "Send a message"
@@ -74,7 +75,7 @@ import: "Import"
 export: "Export"
 files: "Files"
 download: "Download"
-driveFileDeleteConfirm: "Are you sure you want to delete \"{name}\"? It will also vanish from all contents that use it."
+driveFileDeleteConfirm: "Do you want to remove the file \"{name}\"? Some content using this file will also be removed."
 unfollowConfirm: "Are you sure you want to unfollow {name}?"
 exportRequested: "You've requested an export. This may take a while. It will be added to your Drive once completed."
 importRequested: "You've requested an import. This may take a while."
@@ -105,7 +106,7 @@ unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
 enterEmoji: "Enter an emoji"
 renote: "Renote"
-unrenote: "Take back renote"
+unrenote: "Remove renote"
 renoted: "Renoted."
 cantRenote: "This post can't be renoted."
 cantReRenote: "A renote can't be renoted."
@@ -156,6 +157,7 @@ addEmoji: "Add an emoji"
 settingGuide: "Recommended settings"
 cacheRemoteFiles: "Cache remote files"
 cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."
+youCanCleanRemoteFilesCache: "You can clear the cache by clicking the 🗑️ button in the file management view."
 cacheRemoteSensitiveFiles: "Cache sensitive remote files"
 cacheRemoteSensitiveFilesDescription: "When this setting is disabled, sensitive remote files are loaded directly from the remote instance without caching."
 flagAsBot: "Mark this account as a bot"
@@ -354,7 +356,6 @@ invite: "Invite"
 driveCapacityPerLocalAccount: "Drive capacity per local user"
 driveCapacityPerRemoteAccount: "Drive capacity per remote user"
 inMb: "In megabytes"
-iconUrl: "Icon URL"
 bannerUrl: "Banner image URL"
 backgroundImageUrl: "Background image URL"
 basicInfo: "Basic info"
@@ -410,10 +411,13 @@ aboutMisskey: "About Misskey"
 administrator: "Administrator"
 token: "Token"
 2fa: "Two-factor authentication"
+setupOf2fa: "Setup two-factor authentification"
 totp: "Authenticator App"
 totpDescription: "Use an authenticator app to enter one-time passwords"
 moderator: "Moderator"
 moderation: "Moderation"
+moderationNote: "Moderation note"
+addModerationNote: "Add moderation note"
 nUsersMentioned: "Mentioned by {n} users"
 securityKeyAndPasskey: "Security- and passkeys"
 securityKey: "Security key"
@@ -579,7 +583,7 @@ serviceworkerInfo: "Must be enabled for push notifications."
 deletedNote: "Deleted note"
 invisibleNote: "Invisible note"
 enableInfiniteScroll: "Automatically load more"
-visibility: "Visiblility"
+visibility: "Visibility"
 poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
@@ -653,6 +657,7 @@ behavior: "Behavior"
 sample: "Sample"
 abuseReports: "Reports"
 reportAbuse: "Report"
+reportAbuseRenote: "Report renote"
 reportAbuseOf: "Report {name}"
 fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific note, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
@@ -680,6 +685,7 @@ createNewClip: "Create new clip"
 unclip: "Unclip"
 confirmToUnclipAlreadyClippedNote: "This note is already part of the \"{name}\" clip. Do you want to remove it from this clip instead?"
 public: "Public"
+private: "Private"
 i18nInfo: "Misskey is being translated into various languages by volunteers. You can help at {link}."
 manageAccessTokens: "Manage access tokens"
 accountInfo: "Account Info"
@@ -1018,7 +1024,7 @@ retryAllQueuesConfirmText: "This will temporarily increase the server load."
 enableChartsForRemoteUser: "Generate remote user data charts"
 enableChartsForFederatedInstances: "Generate remote instance data charts"
 showClipButtonInNoteFooter: "Add \"Clip\" to note action menu"
-largeNoteReactions: "Enlargen displayed reactions"
+reactionsDisplaySize: "Reaction display size"
 noteIdOrUrl: "Note ID or URL"
 video: "Video"
 videos: "Videos"
@@ -1094,6 +1100,27 @@ expired: "Expired"
 doYouAgree: "Agree?"
 beSureToReadThisAsItIsImportant: "Please read this important information."
 iHaveReadXCarefullyAndAgree: "I have read the text \"{x}\" and agree."
+dialog: "Dialog"
+icon: "Icon"
+forYou: "For you"
+currentAnnouncements: "Current announcements"
+pastAnnouncements: "Past announcements"
+youHaveUnreadAnnouncements: "There are unread announcements."
+useSecurityKey: "Please follow your browser's or device's instructions to use your security- or passkey."
+replies: "Reply"
+renotes: "Renotes"
+loadReplies: "Show replies"
+loadConversation: "Show conversation"
+pinnedList: "Pinned list"
+_announcement:
+  forExistingUsers: "Existing users only"
+  forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
+  needConfirmationToRead: "Require separate read confirmation"
+  needConfirmationToReadDescription: "A separate prompt to confirm marking this announcement as read will be displayed if enabled. This announcement will also be excluded from any \"Mark all as read\" functionality."
+  end: "Archive announcement"
+  tooManyActiveAnnouncementDescription: "Having too many active announcements may worsen the user experience. Please consider archiving announcements that have become obsolete."
+  readConfirmTitle: "Mark as read?"
+  readConfirmText: "This will mark the contents of \"{title}\" as read."
 _initialAccountSetting:
   accountCreated: "Your account was successfully created!"
   letsStartAccountSetup: "For starters, let's set up your profile."
@@ -1111,6 +1138,13 @@ _initialAccountSetting:
   laterAreYouSure: "Really do profile setup later?"
 _serverRules:
   description: "A set of rules to be displayed before registration. Setting a summary of the Terms of Service is recommended."
+_serverSettings:
+  iconUrl: "Icon URL"
+  appIconDescription: "Specifies the icon to use when {host} is displayed as an app."
+  appIconUsageExample: "E.g. As PWA, or when displayed as a home screen bookmark on a phone"
+  appIconStyleRecommendation: "As the icon may be cropped to a square or circle, an icon with colored margin around the content is recommended."
+  appIconResolutionMustBe: "The minimum resolution is {resolution}."
+  manifestJsonOverride: "manifest.json Override"
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -1365,6 +1399,9 @@ _achievements:
       title: "Brain Diver"
       description: "Post the link to Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "Test overflow"
+      description: "Trigger the notification test repeatedly within an extremely short time"
 _role:
   new: "New role"
   edit: "Edit role"
@@ -1679,14 +1716,14 @@ _2fa:
   step1: "First, install an authentication app (such as {a} or {b}) on your device."
   step2: "Then, scan the QR code displayed on this screen."
   step2Click: "Clicking on this QR code will allow you to register 2FA to your security key or phone authenticator app."
-  step2Url: "You can also enter this URL if you're using a desktop program:"
+  step2Uri: "Enter the following URI if you are using a desktop program"
   step3Title: "Enter an authentication code"
   step3: "Enter the token provided by your app to finish setup."
+  setupCompleted: "Setup complete"
   step4: "From now on, any future login attempts will ask for such a login token."
   securityKeyNotSupported: "Your browser does not support security keys."
   registerTOTPBeforeKey: "Please set up an authenticator app to register a security or pass key."
   securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your account."
-  chromePasskeyNotSupported: "Chrome passkeys are currently not supported."
   registerSecurityKey: "Register a security or pass key"
   securityKeyName: "Enter a key name"
   tapSecurityKey: "Please follow your browser to register the security or pass key"
@@ -1697,6 +1734,11 @@ _2fa:
   renewTOTPConfirm: "This will cause verification codes from your previous app to stop working"
   renewTOTPOk: "Reconfigure"
   renewTOTPCancel: "Cancel"
+  checkBackupCodesBeforeCloseThisWizard: "Before you close this window, please note the following backup codes."
+  backupCodes: "Backup codes"
+  backupCodesDescription: "You can use these codes to gain access to your account in case of becoming unable to use your two-factor authentificator app. Each can only be used once. Please keep them in a safe place."
+  backupCodeUsedWarning: "A backup code has been used. Please reconfigure two-factor authentification as soon as possible if you are no longer able to use it."
+  backupCodesExhaustedWarning: "All backup codes have been used. Should you lose access to your two-factor authentification app, you will be unable to access this account. Please reconfigure two-factor authentification."
 _permissions:
   "read:account": "View your account information"
   "write:account": "Edit your account information"
@@ -1718,10 +1760,10 @@ _permissions:
   "read:reactions": "View your reactions"
   "write:reactions": "Edit your reactions"
   "write:votes": "Vote on a poll"
-  "read:pages": "View your pages"
+  "read:pages": "View your Pages"
-  "write:pages": "Edit or delete your pages"
+  "write:pages": "Edit or delete your Pages"
-  "read:page-likes": "View your likes on pages"
+  "read:page-likes": "View list of liked Pages"
-  "write:page-likes": "Edit your likes on pages"
+  "write:page-likes": "Edit list of liked Pages"
   "read:user-groups": "View your user groups"
   "write:user-groups": "Edit or delete your user groups"
   "read:channels": "View your channels"
@@ -1730,6 +1772,10 @@ _permissions:
   "write:gallery": "Edit your gallery"
   "read:gallery-likes": "View your list of liked gallery posts"
   "write:gallery-likes": "Edit your list of liked gallery posts"
+  "read:flash": "View Play"
+  "write:flash": "Edit Plays"
+  "read:flash-likes": "View list of liked Plays"
+  "write:flash-likes": "Edit list of liked Plays"
 _auth:
   shareAccessTitle: "Granting application permissions"
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
@@ -1965,6 +2011,10 @@ _notification:
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Push notifications have been updated"
   achievementEarned: "Achievement unlocked"
+  testNotification: "Test notification"
+  checkNotificationBehavior: "Check notification appearance"
+  sendTestNotification: "Send test notification"
+  notificationWillBeDisplayedLikeThis: "Notifications look like this"
   _types:
     all: "All"
     follow: "New followers"
@@ -2000,6 +2050,8 @@ _deck:
   introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
   widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
   useSimpleUiForNonRootPages: "Use simplified UI to navigated pages"
+  usedAsMinWidthWhenFlexible: "Minimum width will be used for this when the \"Auto-adjust width\" option is enabled"
+  flexible: "Auto-adjust width"
   _columns:
     main: "Main"
     widgets: "Widgets"

locales/es-ES.yml

@@ -8,10 +8,10 @@ search: "Buscar"
 notifications: "Notificaciones"
 username: "Nombre de usuario"
 password: "Contraseña"
-forgotPassword: "Olvidé mi Contraseña"
+forgotPassword: "Olvidé mi contraseña"
 fetchingAsApObject: "Buscando en el fediverso"
 ok: "OK"
-gotIt: "¡Lo tengo!"
+gotIt: "Entendido"
 cancel: "Cancelar"
 noThankYou: "No gracias"
 enterUsername: "Introduce el nombre de usuario"
@@ -20,8 +20,8 @@ noNotes: "No hay notas"
 noNotifications: "No hay notificaciones"
 instance: "Instancia"
 settings: "Configuración"
-notificationSettings: "Configurar las notificaciones"
+notificationSettings: "Ajustes de notificaciones"
-basicSettings: "Configuración Básica"
+basicSettings: "Configuración básica"
 otherSettings: "Configuración avanzada"
 openInWindow: "Abrir en una ventana"
 profile: "Perfil"
@@ -45,6 +45,7 @@ pin: "Fijar al perfil"
 unpin: "Desfijar"
 copyContent: "Copiar contenido"
 copyLink: "Copiar enlace"
+copyLinkRenote: "Copiar enlace de renota"
 delete: "Borrar"
 deleteAndEdit: "Borrar y editar"
 deleteAndEditConfirm: "¿Estás seguro de que quieres borrar esta nota y editarla? Perderás todas las reacciones, renotas y respuestas."
@@ -55,8 +56,8 @@ copyRSS: "Copiar RSS"
 copyUsername: "Copiar nombre de usuario"
 copyUserId: "Copiar ID del usuario"
 copyNoteId: "Copiar ID de la nota"
-copyFileId: "Copiar un archivo ID"
+copyFileId: "Copiar ID del archivo"
-copyFolderId: "Copiar carpeta ID"
+copyFolderId: "Copiar ID de carpeta"
 copyProfileUrl: "Copiar la URL del perfil"
 searchUser: "Buscar un usuario"
 reply: "Responder"
@@ -156,6 +157,7 @@ addEmoji: "Agregar emoji"
 settingGuide: "Configuración sugerida"
 cacheRemoteFiles: "Mantener en cache los archivos remotos"
 cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
+youCanCleanRemoteFilesCache: "Puedes vaciar la caché pulsando en el botón 🗑️ en el administrador de archivos."
 cacheRemoteSensitiveFiles: "Cachear archivos remotos sensibles"
 cacheRemoteSensitiveFilesDescription: "Cuando esta opción está desactivada, los archivos remotos sensibles son cargador directamente de la instancia origen sin ser cacheados."
 flagAsBot: "Esta cuenta es un bot"
@@ -354,7 +356,6 @@ invite: "Invitar"
 driveCapacityPerLocalAccount: "Capacidad del drive por usuario local"
 driveCapacityPerRemoteAccount: "Capacidad del drive por usuario remoto"
 inMb: "En megabytes"
-iconUrl: "URL de la imagen del avatar"
 bannerUrl: "URL de la imagen del banner"
 backgroundImageUrl: "URL de la imagen de fondo"
 basicInfo: "Información básica"
@@ -410,10 +411,13 @@ aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Token"
 2fa: "Autenticación de doble factor"
+setupOf2fa: "Configurar la autenticación de dos factores"
 totp: "Aplicación autentícadora"
 totpDescription: "Ingresa una contaseña de un sólo uso usando la aplicación autenticadora"
 moderator: "Moderador"
 moderation: "Moderación"
+moderationNote: "Nota de moderación"
+addModerationNote: "Añadir nota de moderación"
 nUsersMentioned: "{n} usuarios mencionados"
 securityKeyAndPasskey: "Clave de seguridad / clave de paso"
 securityKey: "Clave de seguridad"
@@ -653,6 +657,7 @@ behavior: "Comportamiento"
 sample: "Muestra"
 abuseReports: "Reportes"
 reportAbuse: "Reportar"
+reportAbuseRenote: "Reportar renota"
 reportAbuseOf: "Reportar a {name}"
 fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en particular, ingrese la URL de esta."
 abuseReported: "Se ha enviado el reporte. Muchas gracias."
@@ -680,6 +685,7 @@ createNewClip: "Crear clip nuevo"
 unclip: "Quitar clip"
 confirmToUnclipAlreadyClippedNote: "Esta nota ya está incluida en el clip \"{name}\". ¿Quiere quitar la nota del clip?"
 public: "Público"
+private: "Privado"
 i18nInfo: "Misskey está siendo traducido a varios idiomas gracias a voluntarios. Se puede colaborar traduciendo en {link}"
 manageAccessTokens: "Administrar tokens de acceso"
 accountInfo: "Información de la Cuenta"
@@ -1018,7 +1024,7 @@ retryAllQueuesConfirmText: "La carga del servidor está incrementándose tempora
 enableChartsForRemoteUser: "Generar gráficas de usuarios remotos."
 enableChartsForFederatedInstances: "Generar gráficos de servidores remotos"
 showClipButtonInNoteFooter: "Añadir \"Clip\" al menú de notas"
-largeNoteReactions: "Agrandar las reacciones de las notas"
+reactionsDisplaySize: "Tamaño de las reacciones"
 noteIdOrUrl: "ID o URL de la nota"
 video: "Video"
 videos: "Video"
@@ -1094,6 +1100,24 @@ expired: "Caducada"
 doYouAgree: "¿Está de acuerdo?"
 beSureToReadThisAsItIsImportant: "Por favor lea esto que es importante"
 iHaveReadXCarefullyAndAgree: "He leído el texto {x} y estoy de acuerdo"
+dialog: "Diálogo"
+icon: "Avatar"
+forYou: "Para ti"
+currentAnnouncements: "Anuncios actuales"
+pastAnnouncements: "Anuncios anteriores"
+youHaveUnreadAnnouncements: "Hay anuncios sin leer"
+useSecurityKey: "Por favor, sigue las instrucciones de tu dispositivo o navegador para usar tu clave de seguridad o tu clave de paso."
+replies: "Responder"
+renotes: "Renotar"
+_announcement:
+  forExistingUsers: "Solo para usuarios registrados"
+  forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán."
+  needConfirmationToRead: "Requerir confirmación de lectura aparte"
+  needConfirmationToReadDescription: "Si se habilita esta opción, se pedirá una confirmación de lectura aparte. Además, este anuncio será excluido de cualquier funcionalidad de \"Marcar todos como leídos\"."
+  end: "Anuncios archivados"
+  tooManyActiveAnnouncementDescription: "Tener demasiados anuncios activos empeora la experiencia de usuario. Por favor, considera archivar aquellos anuncios que hayan quedado obsoletos."
+  readConfirmTitle: "¿Marcar como leído?"
+  readConfirmText: "Esto marcará el contenido de \"{title}\" como leído."
 _initialAccountSetting:
   accountCreated: "¡La cuenta ha sido creada!"
   letsStartAccountSetup: "Para empezar, creemos tu perfil."
@@ -1111,6 +1135,9 @@ _initialAccountSetting:
   laterAreYouSure: "¿Realmente quieres configurar tu perfil después?"
 _serverRules:
   description: "Un conjunto de reglas que serán mostradas antes del registro. Configurar un sumario de términos de servicio es recomendado."
+_serverSettings:
+  iconUrl: "URL del ícono"
+  manifestJsonOverride: "Sobreescribir manifest.json"
 _accountMigration:
   moveFrom: "Trasladar de otra cuenta a ésta"
   moveFromSub: "Crear un alias para otra cuenta."
@@ -1365,6 +1392,9 @@ _achievements:
       title: "Brain Diver"
       description: "Publicaste un vínculo a \"Brain Diver\""
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "Sobrecarga de pruebas"
+      description: "Envía muchas notificaciones de prueba en un corto espacio de tiempo"
 _role:
   new: "Crear rol"
   edit: "Editar rol"
@@ -1679,14 +1709,14 @@ _2fa:
   step1: "Primero, instale en su dispositivo la aplicación de autenticación {a} o {b} u otra."
   step2: "Luego, escanee con la aplicación el código QR mostrado en pantalla."
   step2Click: "Clicking on this QR code will allow you to register 2FA to your security key or phone authenticator app.\nTocar este código QR te permitirá registrar la autenticación 2FA a tu llave de seguridad o aplicación autenticadora."
-  step2Url: "En una aplicación de escritorio se puede ingresar la siguiente URL:"
+  step2Uri: "Si usas una aplicación de escritorio, introduce en ella la siguiente URL."
   step3Title: "Ingresa un código de autenticación"
   step3: "Para terminar, ingrese el token mostrado en la aplicación."
+  setupCompleted: "Configuración completada"
   step4: "Ahora cuando inicie sesión, ingrese el mismo token"
   securityKeyNotSupported: "Tu navegador no soporta claves de autenticación."
   registerTOTPBeforeKey: "Please set up an authenticator app to register a security or pass key.\npor favor. configura una aplicación de autenticación para registrar una llave de seguridad."
   securityKeyInfo: "Se puede configurar el inicio de sesión usando una clave de seguridad de hardware que soporte FIDO2 o con un certificado de huella digital o con un PIN"
-  chromePasskeyNotSupported: "Las llaves de seguridad de Chrome no son soportadas por el momento."
   registerSecurityKey: "Registrar una llave de seguridad"
   securityKeyName: "Ingresa un nombre para la clave"
   tapSecurityKey: "Por favor, sigue tu navegador para registrar una llave de seguridad"
@@ -1697,6 +1727,11 @@ _2fa:
   renewTOTPConfirm: "This will cause verification codes from your previous app to stop working\nEsto hará que los códigos de verificación de la aplicación anterior dejen de funcionar"
   renewTOTPOk: "Reconfigurar"
   renewTOTPCancel: "No gracias"
+  checkBackupCodesBeforeCloseThisWizard: "Por favor, copia los siguientes códigos de respaldo antes de finalizar el asistente."
+  backupCodes: "Códigos de Respaldo"
+  backupCodesDescription: "En caso de que no puedas usar tu aplicación de autenticación, podrás usar los códigos de respaldo que figuran abajo para acceder a tu cuenta. Asegúrate de guardar en lugar seguro los códigos de respaldo. Cada uno de los códigos de respaldo es de un solo uso."
+  backupCodeUsedWarning: "Has usado todos los códigos de respaldo. Si dejas de tener acceso a tu aplicación de autenticación, no podrás volver a iniciar sesión en tu cuenta. Por favor, reconfigura tu aplicación de autenticación lo antes posible."
+  backupCodesExhaustedWarning: "Has usado todos los códigos de respaldo. Si dejas de tener acceso a tu aplicación de autenticación, no podrás volver a iniciar sesión en la cuenta que figura arriba. Por favor, reconfigura tu aplicación de autenticación lo antes posible."
 _permissions:
   "read:account": "Ver información de la cuenta"
   "write:account": "Editar información de la cuenta"
@@ -1730,6 +1765,10 @@ _permissions:
   "write:gallery": "Editar galería"
   "read:gallery-likes": "Ver favoritos de la galería"
   "write:gallery-likes": "Editar favoritos de la galería"
+  "read:flash": "Ver Play"
+  "write:flash": "Editar Plays"
+  "read:flash-likes": "Ver los Play que me gustan"
+  "write:flash-likes": "Editar lista de Play que me gustan"
 _auth:
   shareAccessTitle: "Permisos de la aplicación"
   shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
@@ -1965,6 +2004,10 @@ _notification:
   unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Se han actualizado las notificaciones push"
   achievementEarned: "Logro desbloqueado"
+  testNotification: "Notificación de prueba"
+  checkNotificationBehavior: "Comprobar comportamiento de la notificación"
+  sendTestNotification: "Enviar notificación de prueba"
+  notificationWillBeDisplayedLikeThis: "Las notificaciones tendrán este aspecto"
   _types:
     all: "Todo"
     follow: "Siguiendo"
@@ -2000,6 +2043,8 @@ _deck:
   introduction2: "Presiona en la  + de la derecha de la pantalla para añadir nuevas columnas donde quieras."
   widgetsIntroduction: "Por favor selecciona \"Editar Widgets\" en el menú columna y agrega un widget."
   useSimpleUiForNonRootPages: "Mostrar páginas no pertenecientes a la raíz con la interfaz simple"
+  usedAsMinWidthWhenFlexible: "Se usará el ancho mínimo cuando la opción \"Autoajustar ancho\" esté habilitada"
+  flexible: "Autoajustar ancho"
   _columns:
     main: "Principal"
     widgets: "Widgets"

locales/fr-FR.yml

@@ -47,7 +47,7 @@ copyContent: "Copier le contenu"
 copyLink: "Copier le lien"
 delete: "Supprimer"
 deleteAndEdit: "Supprimer et réécrire"
-deleteAndEditConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note et la reformuler ? Vous perdrez toutes les réactions, renotes et réponses y afférentes."
+deleteAndEditConfirm: "Êtes-vous sûr de vouloir effacer cette note et la modifier ? Vous perdrez toutes les réactions, renotes et réponses."
 addToList: "Ajouter à une liste"
 addToAntenna: "Ajouter à l’antenne"
 sendMessage: "Envoyer un message"
@@ -58,7 +58,7 @@ copyNoteId: "Copier l'identifiant de la note"
 copyFileId: "Copier l'identifiant du fichier"
 copyFolderId: "Copier l'identifiant du dossier"
 copyProfileUrl: "Copier l'URL du profil"
-searchUser: "Chercher un utilisateur"
+searchUser: "Chercher un·e utilisateur·rice"
 reply: "Répondre"
 loadMore: "Afficher plus …"
 showMore: "Voir plus"
@@ -76,14 +76,14 @@ files: "Fichiers"
 download: "Télécharger"
 driveFileDeleteConfirm: "Êtes-vous sûr de vouloir supprimer le fichier \"{name}\" ? Les notes liées à ce fichier seront aussi supprimées."
 unfollowConfirm: "Désirez-vous vous désabonner de {name} ?"
-exportRequested: "Vous avez demandé une exportation. L’opération pourrait prendre un peu de temps. Une terminée, le fichier résultant sera ajouté au Drive."
+exportRequested: "Vous avez demandé une exportation. L’opération pourrait prendre un peu de temps. Une fois terminée, le fichier sera ajouté au Drive."
 importRequested: "Vous avez initié un import. Cela pourrait prendre un peu de temps."
 lists: "Listes"
 noLists: "Vous n’avez aucune liste"
 note: "Note"
 notes: "Notes"
 following: "Abonnements"
-followers: "Abonnés"
+followers: "Abonné·e·s"
 followsYou: "Vous suit"
 createList: "Créer une liste"
 manageLists: "Gérer les listes"
@@ -138,6 +138,7 @@ unblockConfirm: "Êtes-vous sûr·e de vouloir débloquer ce compte ?"
 suspendConfirm: "Êtes-vous sûr·e de vouloir suspendre ce compte ?"
 unsuspendConfirm: "Êtes-vous sûr·e de vouloir annuler la suspension de ce compte ?"
 selectList: "Sélectionner une liste"
+editList: "Modifier la liste"
 selectChannel: "Sélectionner un canal"
 selectAntenna: "Sélectionner une antenne"
 editAntenna: "Modifier l'antenne"
@@ -250,7 +251,7 @@ announcements: "Annonces"
 imageUrl: "URL de l’image"
 remove: "Supprimer"
 removed: "Supprimé"
-removeAreYouSure: "Êtes-vous sûr·e de vouloir supprimer「{x}」?"
+removeAreYouSure: "Êtes-vous sûr·e de vouloir supprimer « {x} » ?"
 deleteAreYouSure: "Êtes-vous sûr·e de vouloir supprimer「{x}」?"
 resetAreYouSure: "Voulez-vous réinitialiser ?"
 saved: "Enregistré"
@@ -271,6 +272,7 @@ startMessaging: "Commencer à discuter"
 nUsersRead: "Lu par {n} personnes"
 agreeTo: "J’accepte {0}"
 agree: "Accepter"
+basicNotesBeforeCreateAccount: "Notes importantes"
 termsOfService: "Conditions d'utilisation"
 start: "Commencer"
 home: "Principal"
@@ -349,7 +351,6 @@ invite: "Inviter"
 driveCapacityPerLocalAccount: "Volume du Drive par utilisateur local"
 driveCapacityPerRemoteAccount: "Volume du Drive par utilisateur distant"
 inMb: "en mégaoctets"
-iconUrl: "URL de l'icône"
 bannerUrl: "URL de l’image de la bannière"
 backgroundImageUrl: "URL de l'image d'arrière-plan"
 basicInfo: "Informations basiques"
@@ -409,6 +410,8 @@ totp: "Application d'authentification"
 totpDescription: "Entrez un mot de passe à usage unique à l'aide d'une application d'authentification"
 moderator: "Modérateur·rice·s"
 moderation: "Modérations"
+moderationNote: "Note de modération"
+addModerationNote: "Ajouter une note de modération"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
 securityKey: "Clé de sécurité"
 lastUsed: "Dernier utilisé"
@@ -598,7 +601,7 @@ tokenRequested: "Autoriser l'accès au compte"
 pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici."
 notificationType: "Type de notifications"
 edit: "Editer"
-emailServer: "Serveur mail"
+emailServer: "Serveur de messagerie"
 enableEmail: "Activer la distribution de courriel"
 emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
 email: "E-mail "
@@ -665,6 +668,7 @@ createNew: "Créer nouveau"
 optional: "Facultatif"
 createNewClip: "Créer un nouveau clip"
 public: "Public"
+private: "Privé"
 i18nInfo: "Misskey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
 manageAccessTokens: "Gérer les jetons d'accès"
 accountInfo: " Informations du compte "
@@ -818,6 +822,7 @@ translatedFrom: "Traduit depuis {x}"
 accountDeletionInProgress: "La suppression de votre compte est en cours"
 usernameInfo: "C'est un nom qui identifie votre compte sur l'instance de manière unique. Vous pouvez utiliser des lettres de l'alphabet (minuscules et majuscules), des chiffres (de 0 à 9), ou bien le tiret « _ ». Vous ne pourrez pas modifier votre nom d'utilisateur·rice par la suite."
 aiChanMode: "Mode Ai"
+devMode: "Mode développement"
 keepCw: "Garder le CW"
 pubSub: "Comptes Pub/Sub"
 lastCommunication: "Dernière communication"
@@ -827,10 +832,12 @@ breakFollow: "Ne plus suivre"
 breakFollowConfirm: "Êtes-vous sûr de vouloir vous désabonner ?"
 itsOn: "Activé"
 itsOff: "Désactivé"
+on: "Activé"
+off: "Désactivé"
 emailRequiredForSignup: "Une adresse e-mail est nécessaire pour créer un compte"
 unread: "Non lu"
 filter: "Filtre"
-controlPanel: "Panneau de contrôle"
+controlPanel: "Panneau de configuration"
 manageAccounts: "Gérer les comptes"
 makeReactionsPublic: "Rendre les réactions publiques"
 makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions données publique."
@@ -935,20 +942,31 @@ roles: "Rôles"
 role: "Rôles"
 noRole: "Aucun rôle"
 normalUser: "Simple utilisateur·rice"
+undefined: "Non défini"
 assign: "Attribuer"
 color: "Couleur"
 manageCustomEmojis: "Gestion des émojis personnalisés"
 preset: "Préréglage"
 selectFromPresets: "Sélectionner à partir des préréglages"
+achievements: "Accomplissements"
 thisPostMayBeAnnoying: "Cette note peut gêner d'autres personnes."
+thisPostMayBeAnnoyingHome: "Publier vers le fil principal"
 thisPostMayBeAnnoyingCancel: "Annuler"
+thisPostMayBeAnnoyingIgnore: "Publier quand-même"
+internalServerError: "Erreur interne du serveur"
+copyErrorInfo: "Copier les détails de l’erreur"
+exploreOtherServers: "Trouver une autre instance"
+disableFederationOk: "Désactiver"
 license: "Licence"
 video: "Vidéo"
 videos: "Vidéos"
 dataSaver: "Économiseur de données"
 accountMigration: "Migration de compte"
 accountMoved: "Cet·te utilisateur·rice a migré son compte vers :"
+accountMovedShort: "Ce compte a migré"
+operationForbidden: "Opération non autorisée"
 addMemo: "Ajouter un mémo"
+reactionsList: "Réactions"
 notificationDisplay: "Style des notifications"
 leftTop: "En haut à gauche"
 rightTop: "En haut à droite"
@@ -957,12 +975,37 @@ rightBottom: "En bas à droite"
 vertical: "Vertical"
 horizontal: "Latéral"
 serverRules: "Règles du serveur"
+archive: "Archive"
 youFollowing: "Abonné·e"
+later: "Plus tard"
+goToMisskey: "Retour vers Misskey"
+expirationDate: "Date d’expiration"
+usedAt: "Utilisé le"
+unused: "Non-utilisé"
+used: "Utilisé"
+expired: "Expiré"
+doYouAgree: "Êtes-vous d’accord ?"
+icon: "Avatar"
+forYou: "Pour vous"
+replies: "Répondre"
+renotes: "Renoter"
+_announcement:
+  readConfirmTitle: "Marquer comme lu ?"
+_initialAccountSetting:
+  profileSetting: "Paramètres du profil"
+  privacySetting: "Paramètres de confidentialité"
+_accountMigration:
+  moveToLabel: "Compte vers lequel vous migrez :"
+  startMigration: "Migrer"
+  movedTo: "Compte vers lequel vous migrez :"
 _achievements:
   _types:
     _notes1:
+      title: "Je viens tout juste de configurer mon msky"
       description: "Publiez votre première note"
       flavor: "Passez un bon moment avec Misskey !"
+    _notes10:
+      title: "Quelques notes"
     _notes100:
       title: "Beaucoup de notes"
     _notes100000:
@@ -977,16 +1020,23 @@ _achievements:
       title: "Débutant Ⅲ"
       description: "Se connecter pour un total de 15 jours"
     _login30:
+      title: "Misskeynaute I"
       description: "Se connecter pour un total de 30 jours"
     _login60:
+      title: "Misskeynaute II"
       description: "Se connecter pour un total de 60 jours"
     _login100:
+      title: "Misskeynaute III"
       description: "Se connecter pour un total de 100 jours"
+      flavor: "Misskeynaute acharné·e"
     _login200:
+      title: "Régulier I"
       description: "Se connecter pour un total de 200 jours"
     _login300:
+      title: "Régulier II"
       description: "Se connecter pour un total de 300 jours"
     _login400:
+      title: "Régulier III"
       description: "Se connecter pour un total de 400 jours"
     _login500:
       description: "Se connecter pour un total de 500 jours"
@@ -1000,6 +1050,8 @@ _achievements:
       description: "Se connecter pour un total de 900 jours"
     _login1000:
       flavor: "Merci d'utiliser Misskey !"
+    _profileFilled:
+      description: "Configuration de votre profil"
     _markedAsCat:
       title: "Je suis un chat"
       flavor: "Je n'ai pas encore de nom"
@@ -1009,6 +1061,16 @@ _achievements:
       title: "Abonnez-moi !"
     _iLoveMisskey:
       title: "J’adore Misskey"
+      description: "Publication « J’❤ #Misskey »"
+    _foundTreasure:
+      title: "Chasse au trésor"
+      description: "Vous avez trouvé le trésor caché"
+    _postedAtLateNight:
+      flavor: "C’est l’heure d’aller au lit."
+    _postedAt0min0sec:
+      title: "Horloge parlante"
+      description: "Publication d’une note à 00:00"
+      flavor: "Tic tac, tic tac, tic tac, ding !"
     _viewInstanceChart:
       title: "Analyste"
     _loggedInOnBirthday:
@@ -1018,7 +1080,11 @@ _achievements:
     _cookieClicked:
       flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
 _role:
+  name: "Nom du rôle"
+  description: "Description du rôle"
+  permission: "Rôle et autorisations"
   assignTarget: "Attribuer"
+  condition: "Condition"
   priority: "Priorité"
   _priority:
     low: "Basse"
@@ -1110,6 +1176,8 @@ _aboutMisskey:
   donate: "Soutenir Misskey"
   morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
   patrons: "Contributeurs"
+_displayOfSensitiveMedia:
+  force: "Masquer tous les médias"
 _instanceTicker:
   none: "Cacher "
   remote: "Montrer pour les utilisateur·ice·s distant·e·s"
@@ -1128,6 +1196,8 @@ _channel:
   following: "Abonné·e"
   usersCount: "{n} Participant·e·s"
   notesCount: "{n} Notes"
+  nameAndDescription: "Nom et description"
+  nameOnly: "Nom seulement"
 _menuDisplay:
   sideFull: "Latéral"
   sideIcon: "Latéral (icônes)"
@@ -1245,16 +1315,24 @@ _time:
   minute: "min"
   hour: "h"
   day: "j"
+_timelineTutorial:
+  title: "Comment utiliser Misskey"
+  step3_1: "Avez-vous publié votre première note ?"
 _2fa:
   alreadyRegistered: "Configuration déjà achevée."
   step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
   step2: "Ensuite, scannez le code QR affiché sur l’écran."
-  step2Url: "Vous pouvez également saisir cette URL si vous utilisez un programme de bureau :"
+  step3Title: "Veuillez saisir le code d’authentification"
   step3: "Entrez le jeton affiché sur votre application pour compléter la configuration."
+  setupCompleted: "Configuration terminée avec succès !"
   step4: "À partir de maintenant, ce même jeton vous sera demandé à chacune de vos connexions."
+  securityKeyNotSupported: "Votre navigateur ne prend pas en charge les clés de sécurité."
   securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser davantage le processus de connexion grâce à une clé de sécurité matérielle qui prend en charge FIDO2, ou bien en configurant l'authentification par empreinte digitale ou par code PIN sur votre appareil."
+  securityKeyName: "Nom de la clé"
   removeKeyConfirm: "Voulez-vous supprimer {name} ?"
+  renewTOTPOk: "Reconfigurer"
   renewTOTPCancel: "Pas maintenant"
+  backupCodes: "Codes de Secours"
 _permissions:
   "read:account": "Afficher les informations du compte"
   "write:account": "Mettre à jour les informations de votre compte"
@@ -1471,7 +1549,7 @@ _pages:
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
   eyeCatchingImageSet: "Définir une image attractive"
-  eyeCatchingImageRemove: "Supprimer l'image attractive"
+  eyeCatchingImageRemove: "Supprimer la miniature"
   chooseBlock: "Ajouter un bloc"
   selectType: "Choisir un type"
   contentBlocks: "Contenu"
@@ -1504,6 +1582,7 @@ _notification:
   pollEnded: "Les résultats du sondage sont disponibles"
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Les notifications push ont été mises à jour"
+  achievementEarned: "Accomplissement"
   _types:
     all: "Toutes"
     follow: "Nouvel·le abonné·e"
@@ -1515,6 +1594,7 @@ _notification:
     pollEnded: "Sondages se cloturant"
     receiveFollowRequest: "Demande d'abonnement reçue"
     followRequestAccepted: "Demande d'abonnement acceptée"
+    achievementEarned: "Accomplissement"
     app: "Notifications provenant des apps"
   _actions:
     followBack: "Suivre"
@@ -1536,6 +1616,7 @@ _deck:
   deleteProfile: "Supprimer le profil"
   introduction: "Créez l’interface parfaite qui vous sied en arrangeant librement les colonnes !"
   introduction2: "Cliquez sur le + à droite de l'écran pour ajouter de nouvelles colonnes quand vous le souhaitez."
+  flexible: "Ajuster automatiquement la largeur"
   _columns:
     main: "Principale"
     widgets: "Widgets"

locales/generateDTS.js

@@ -1,6 +1,11 @@
 import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
 import * as yaml from 'js-yaml';
-import * as ts from 'typescript';
+import ts from 'typescript';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 function createMembers(record) {
 	return Object.entries(record)

locales/hu-HU.yml

@@ -77,6 +77,7 @@ smtpUser: "Felhasználónév"
 smtpPass: "Jelszó"
 user: "Felhasználók"
 searchByGoogle: "Keresés"
+renotes: "Renote"
 _theme:
   keys:
     renote: "Renote"

locales/id-ID.yml

@@ -133,12 +133,12 @@ renoteMute: "Matikan renote"
 renoteUnmute: "Batal mematikan renote"
 block: "Blokir"
 unblock: "Buka blokir"
-suspend: "Bekukan"
+suspend: "Tangguhkan"
-unsuspend: "Buka pembekuan"
+unsuspend: "Batalkan penangguhan"
 blockConfirm: "Apakah kamu yakin ingin memblokir akun ini?"
 unblockConfirm: "Apakah kamu yakin ingin membuka blokir akun ini?"
-suspendConfirm: "Apakah kamu yakin ingin membekukan akun ini?"
+suspendConfirm: "Apakah kamu yakin ingin menangguhkan akun ini?"
-unsuspendConfirm: "Apakah kamu yakin ingin membuka pembekuan akun ini?"
+unsuspendConfirm: "Apakah kamu yakin ingin membatalkan penangguhan akun ini?"
 selectList: "Pilih daftar"
 editList: "Sunting daftar"
 selectChannel: "Pilih kanal"
@@ -156,6 +156,8 @@ addEmoji: "Tambahkan emoji"
 settingGuide: "Pengaturan rekomendasi"
 cacheRemoteFiles: "Tembolokkan berkas dari instansi luar"
 cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas dari instansi luar akan dimuat langsung. Menonaktifkan ini akan mengurangi penggunaan penyimpanan peladen, namun dapat menyebabkan peningkatan lalu lintas bandwidth, karena keluku tidak dihasilkan."
+cacheRemoteSensitiveFiles: "Tembolokkan berkas dari instansi luar"
+cacheRemoteSensitiveFilesDescription: "Menonaktifkan pengaturan ini menyebabkan berkas sensitif dari instansi luar ditautkan secara langsung, bukan ditembolok."
 flagAsBot: "Atur akun ini sebagai Bot"
 flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Misskey untuk memperlakukan akun ini sebagai bot."
 flagAsCat: "Atur akun ini sebagai kucing"
@@ -227,7 +229,7 @@ noCustomEmojis: "Tidak ada emoji kustom"
 noJobs: "Tidak ada kerja"
 federating: "memfederasi"
 blocked: "Diblokir"
-suspended: "Diberhentikan"
+suspended: "Ditangguhkan"
 all: "Semua"
 subscribing: "Berlangganan"
 publishing: "Sedang menyiarkan langsung"
@@ -352,7 +354,6 @@ invite: "Undang"
 driveCapacityPerLocalAccount: "Kapasitas drive per pengguna lokal"
 driveCapacityPerRemoteAccount: "Kapasitas drive per pengguna remote"
 inMb: "dalam Megabytes"
-iconUrl: "URL Gambar ikon"
 bannerUrl: "URL Banner"
 backgroundImageUrl: "URL Gambar latar"
 basicInfo: "Informasi Umum"
@@ -391,10 +392,10 @@ withReplies: "Termasuk balasan"
 connectedTo: "Akun berikut terhubung"
 notesAndReplies: "Catatan dan balasan"
 withFiles: "Media"
-silence: "Bungkam"
+silence: "Senyapkan"
-silenceConfirm: "Apakah kamu yakin ingin membungkam pengguna ini?"
+silenceConfirm: "Apakah kamu yakin ingin menyenyapkan pengguna ini?"
-unsilence: "Hapus bungkam"
+unsilence: "Batalkan senyap"
-unsilenceConfirm: "Apakah kamu ingin untuk batal membungkam pengguna ini?"
+unsilenceConfirm: "Apakah kamu ingin untuk batal menyenyapkan pengguna ini?"
 popularUsers: "Pengguna populer"
 recentlyUpdatedUsers: "Pengguna dengan aktivitas terkini"
 recentlyRegisteredUsers: "Pengguna baru saja bergabung"
@@ -557,10 +558,10 @@ deleteAllFiles: "Hapus semua berkas"
 deleteAllFilesConfirm: "Apakah kamu yakin ingin menghapus semua berkas?"
 removeAllFollowing: "Batalkan mengikuti semua pengguna"
 removeAllFollowingDescription: "Batal mengikuti semua akun dari {host}. Mohon jalankan ini ketika instansi sudah tidak ada lagi."
-userSuspended: "Pengguna ini telah dibekukan."
+userSuspended: "Pengguna ini telah ditangguhkan"
-userSilenced: "Pengguna ini telah dibungkam."
+userSilenced: "Pengguna ini telah disenyapkan."
-yourAccountSuspendedTitle: "Akun ini dibekukan"
+yourAccountSuspendedTitle: "Akun ini ditangguhkan"
-yourAccountSuspendedDescription: "Akun ini dibekukan karena melanggar ketentuan penggunaan layanan peladen atau semacamnya. Hubungi admin apabila ingin tahu alasan lebih lanjut. Mohon untuk tidak membuat akun baru."
+yourAccountSuspendedDescription: "Akun ini ditangguhkan karena melanggar ketentuan penggunaan layanan peladen atau semacamnya. Hubungi admin apabila ingin mengetahui alasan lebih lanjut. Mohon untuk tidak membuat akun baru."
 tokenRevoked: "Token tidak valid"
 tokenRevokedDescription: "Token ini telah kedaluwarsa. Mohon masuk lagi."
 accountDeleted: "Akun telah dihapus"
@@ -678,6 +679,7 @@ createNewClip: "Buat klip baru"
 unclip: "Batalkan klip"
 confirmToUnclipAlreadyClippedNote: "Catatan ini sudah disertakan di klip \"{name}\". Yakin ingin membatalkan catatan dari klip ini?"
 public: "Publik"
+private: "Tersembunyi"
 i18nInfo: "Misskey diterjemahkan ke dalam banyak bahasa oleh sukarelawan. Kamu juga dapat ikut membantu menerjemahkannya di {link}."
 manageAccessTokens: "Kelola token akses"
 accountInfo: "Informasi akun"
@@ -987,7 +989,7 @@ internalServerErrorDescription: "Peladen sedang mengalami galat tak terduga"
 copyErrorInfo: "Salin detil galat"
 joinThisServer: "Gabung peladen ini"
 exploreOtherServers: "Cari peladen lain"
-letsLookAtTimeline: "LIhat timeline"
+letsLookAtTimeline: "LIhat lini masa"
 disableFederationConfirm: "Matikan federasi?"
 disableFederationConfirmWarn: "Mematikan federasi tidak membuat kiriman menjadi privat. Umumnya, mematikan federasi tidak diperlukan."
 disableFederationOk: "Matikan federasi"
@@ -1016,7 +1018,6 @@ retryAllQueuesConfirmText: "Hal ini akan meningkatkan beban sementara ke peladen
 enableChartsForRemoteUser: "Buat bagan data pengguna instansi luar"
 enableChartsForFederatedInstances: "Buat bagan data peladen instansi luar"
 showClipButtonInNoteFooter: "Tambahkan \"Klip\" ke menu aksi catatan"
-largeNoteReactions: "Besarkan reaksi yang ditampilkan"
 noteIdOrUrl: "ID catatan atau URL"
 video: "Video"
 videos: "Video"
@@ -1073,9 +1074,32 @@ enableServerMachineStats: "Tampilkan informasi mesin peladen menjadi publik"
 enableIdenticonGeneration: "Nyalakan pembuatan Identicon per pengguna"
 turnOffToImprovePerformance: "Matikan untuk tingkatkan performa."
 createInviteCode: "Buat kode undangan"
+createWithOptions: "Buat dengan opsi"
+createCount: "Jumlah undangan"
 inviteCodeCreated: "Kode undangan dibuat"
 inviteLimitExceeded: "Kamu telah mencapai jumlah maksimum kode undangan yang dapat dibuat."
+createLimitRemaining: "Kode undangan yang dapat dibuat: tersisa {limit}"
+inviteLimitResetCycle: "Kamu dapat membuat hingga {limit} kode undangan dalam {time}."
 expirationDate: "Tanggal kedaluwarsa"
+noExpirationDate: "tidak ada tanggal kedaluwarsa"
+inviteCodeUsedAt: "Kode undangan digunakan pada"
+registeredUserUsingInviteCode: "Undangan digunakan oleh"
+waitingForMailAuth: "Menunggu verifikasi surel"
+inviteCodeCreator: "Undangan dibuat oleh"
+usedAt: "Digunakan pada"
+unused: "Tidak digunakan"
+used: "Digunakan"
+expired: "Kedaluwarsa"
+doYouAgree: "Apa kamu setuju?"
+beSureToReadThisAsItIsImportant: "Mohon baca informasi penting berikut."
+iHaveReadXCarefullyAndAgree: "Saya telah membaca \"{x}\" dan menyetujui."
+dialog: "Dialog"
+icon: "Avatar"
+forYou: "Untuk Anda"
+currentAnnouncements: "Pengumuman Saat Ini"
+pastAnnouncements: "Pengumuman Terdahulu"
+replies: "Balas"
+renotes: "Renote"
 _initialAccountSetting:
   accountCreated: "Akun kamu telah sukses dibuat!"
   letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
@@ -1093,6 +1117,8 @@ _initialAccountSetting:
   laterAreYouSure: "Yakin banget untuk atur profil nanti?"
 _serverRules:
   description: "Daftar peraturan akan ditampilkan sebelum pendaftaran. Mengatur ringkasan dari Syarat dan Ketentuan sangat direkomendasikan."
+_serverSettings:
+  iconUrl: "URL ikon"
 _accountMigration:
   moveFrom: "Pindahkan akun lain ke akun ini"
   moveFromSub: "Buat alias ke akun lain"
@@ -1386,6 +1412,9 @@ _role:
     ltlAvailable: "Dapat melihat lini masa lokal"
     canPublicNote: "Dapat mengirim catatan publik"
     canInvite: "Dapat membuat kode undangan instansi"
+    inviteLimit: "Batas jumlah undangan"
+    inviteLimitCycle: "Interval Penerbitan Kode Undangan"
+    inviteExpirationTime: "Interval kedaluwarsa undangan"
     canManageCustomEmojis: "Dapat mengelola Emoji kustom"
     driveCapacity: "Kapasitas Drive"
     alwaysMarkNsfw: "Selalu tandai berkas sebagai NSFW"
@@ -1448,6 +1477,7 @@ _ad:
   back: "Kembali"
   reduceFrequencyOfThisAd: "Tampilkan iklan ini lebih sedikit"
   hide: "Jangan tampilkan"
+  timezoneinfo: "Hari dalam satu minggu ditentukan dari zona waktu peladen."
 _forgotPassword:
   enterEmail: "Masukkan alamat surel yang kamu gunakan pada saat mendaftar. Sebuah tautan untuk mengatur ulang kata sandi kamu akan dikirimkan ke alamat surel tersebut."
   ifNoEmail: "Apabila kamu tidak menggunakan surel pada saat pendaftaran, mohon hubungi admin segera."
@@ -1499,6 +1529,10 @@ _aboutMisskey:
   donate: "Donasi ke Misskey"
   morePatrons: "Kami sangat mengapresiasi dukungan dari banyak penolong lain yang tidak tercantum disini. Terima kasih! 🥰"
   patrons: "Pendukung"
+_displayOfSensitiveMedia:
+  respect: "Sembunyikan media yang ditandai sensitif"
+  ignore: "Tampilkan media yang ditandai sensitif"
+  force: "Sembunyikan semua media"
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna instansi luar"
@@ -1653,14 +1687,12 @@ _2fa:
   step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu."
   step2: "Lalu, pindai kode QR yang ada di layar."
   step2Click: "Mengeklik kode QR ini akan membolehkanmu untuk mendaftarkan 2FA ke security-key atau aplikasi autentikator ponsel."
-  step2Url: "Di aplikasi desktop, masukkan URL berikut:"
   step3Title: "Masukkan kode autentikasi"
   step3: "Masukkan token yang telah disediakan oleh aplikasimu untuk menyelesaikan pemasangan."
   step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi otentikasi kamu."
   securityKeyNotSupported: "Peramban kamu tidak mendukung security key."
   registerTOTPBeforeKey: "Mohon atur aplikasi autentikator untuk mendaftarkan security key atau passkey."
   securityKeyInfo: "Kamu dapat memasang otentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau otentikasi PIN pada perangkatmu."
-  chromePasskeyNotSupported: "Passkey Chrome saat ini tidak didukung."
   registerSecurityKey: "Daftarkan security key atau passkey."
   securityKeyName: "Masukkan nama key."
   tapSecurityKey: "Mohon ikuti peramban kamu untuk mendaftarkan security key atau passkey"
@@ -1671,6 +1703,7 @@ _2fa:
   renewTOTPConfirm: "Hal ini akan menyebabkan kode verifikasi dari aplikasi autentikator sebelumnya berhenti bekerja"
   renewTOTPOk: "Atur ulang"
   renewTOTPCancel: "Tidak sekarang."
+  backupCodes: "Kode Pencadangan"
 _permissions:
   "read:account": "Lihat informasi akun"
   "write:account": "Sunting informasi akun"
@@ -1973,6 +2006,7 @@ _deck:
   introduction: "Buat antarmuka sempurna untukmu dengan menata kolom secara bebas!"
   introduction2: "Klik \"+\" pada kanan layar untuk menambahkan kolom baru kapanpun yang kamu mau."
   widgetsIntroduction: "Mohon pilih \"Sunting gawit\" pada menu kolom dan tambahkan gawit."
+  useSimpleUiForNonRootPages: "Gunakan antarmuka sederhana ke halaman yang dituju"
   _columns:
     main: "Utama"
     widgets: "Widget"

locales/index.d.ts

@@ -48,6 +48,7 @@ export interface Locale {
     "unpin": string;
     "copyContent": string;
     "copyLink": string;
+    "copyLinkRenote": string;
     "delete": string;
     "deleteAndEdit": string;
     "deleteAndEditConfirm": string;
@@ -358,7 +359,6 @@ export interface Locale {
     "driveCapacityPerLocalAccount": string;
     "driveCapacityPerRemoteAccount": string;
     "inMb": string;
-    "iconUrl": string;
     "bannerUrl": string;
     "backgroundImageUrl": string;
     "basicInfo": string;
@@ -414,10 +414,13 @@ export interface Locale {
     "administrator": string;
     "token": string;
     "2fa": string;
+    "setupOf2fa": string;
     "totp": string;
     "totpDescription": string;
     "moderator": string;
     "moderation": string;
+    "moderationNote": string;
+    "addModerationNote": string;
     "nUsersMentioned": string;
     "securityKeyAndPasskey": string;
     "securityKey": string;
@@ -657,6 +660,7 @@ export interface Locale {
     "sample": string;
     "abuseReports": string;
     "reportAbuse": string;
+    "reportAbuseRenote": string;
     "reportAbuseOf": string;
     "fillAbuseReportDescription": string;
     "abuseReported": string;
@@ -684,6 +688,7 @@ export interface Locale {
     "unclip": string;
     "confirmToUnclipAlreadyClippedNote": string;
     "public": string;
+    "private": string;
     "i18nInfo": string;
     "manageAccessTokens": string;
     "accountInfo": string;
@@ -708,6 +713,7 @@ export interface Locale {
     "alwaysMarkSensitive": string;
     "loadRawImages": string;
     "disableShowingAnimatedImages": string;
+    "highlightSensitiveMedia": string;
     "verificationEmailSent": string;
     "notSet": string;
     "emailVerified": string;
@@ -1022,7 +1028,7 @@ export interface Locale {
     "enableChartsForRemoteUser": string;
     "enableChartsForFederatedInstances": string;
     "showClipButtonInNoteFooter": string;
-    "largeNoteReactions": string;
+    "reactionsDisplaySize": string;
     "noteIdOrUrl": string;
     "video": string;
     "videos": string;
@@ -1104,6 +1110,18 @@ export interface Locale {
     "currentAnnouncements": string;
     "pastAnnouncements": string;
     "youHaveUnreadAnnouncements": string;
+    "useSecurityKey": string;
+    "replies": string;
+    "renotes": string;
+    "loadReplies": string;
+    "loadConversation": string;
+    "pinnedList": string;
+    "keepScreenOn": string;
+    "verifiedLink": string;
+    "notifyNotes": string;
+    "unnotifyNotes": string;
+    "authentication": string;
+    "authenticationRequiredToContinue": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;
@@ -1133,6 +1151,14 @@ export interface Locale {
     "_serverRules": {
         "description": string;
     };
+    "_serverSettings": {
+        "iconUrl": string;
+        "appIconDescription": string;
+        "appIconUsageExample": string;
+        "appIconStyleRecommendation": string;
+        "appIconResolutionMustBe": string;
+        "manifestJsonOverride": string;
+    };
     "_accountMigration": {
         "moveFrom": string;
         "moveFromSub": string;
@@ -1462,6 +1488,10 @@ export interface Locale {
                 "description": string;
                 "flavor": string;
             };
+            "_smashTestNotificationButton": {
+                "title": string;
+                "description": string;
+            };
         };
     };
     "_role": {
@@ -1806,18 +1836,17 @@ export interface Locale {
     "_2fa": {
         "alreadyRegistered": string;
         "registerTOTP": string;
-        "passwordToTOTP": string;
         "step1": string;
         "step2": string;
         "step2Click": string;
-        "step2Url": string;
+        "step2Uri": string;
         "step3Title": string;
         "step3": string;
+        "setupCompleted": string;
         "step4": string;
         "securityKeyNotSupported": string;
         "registerTOTPBeforeKey": string;
         "securityKeyInfo": string;
-        "chromePasskeyNotSupported": string;
         "registerSecurityKey": string;
         "securityKeyName": string;
         "tapSecurityKey": string;
@@ -1828,6 +1857,11 @@ export interface Locale {
         "renewTOTPConfirm": string;
         "renewTOTPOk": string;
         "renewTOTPCancel": string;
+        "checkBackupCodesBeforeCloseThisWizard": string;
+        "backupCodes": string;
+        "backupCodesDescription": string;
+        "backupCodeUsedWarning": string;
+        "backupCodesExhaustedWarning": string;
     };
     "_permissions": {
         "read:account": string;
@@ -1862,6 +1896,10 @@ export interface Locale {
         "write:gallery": string;
         "read:gallery-likes": string;
         "write:gallery-likes": string;
+        "read:flash": string;
+        "write:flash": string;
+        "read:flash-likes": string;
+        "write:flash-likes": string;
     };
     "_auth": {
         "shareAccessTitle": string;
@@ -1987,6 +2025,7 @@ export interface Locale {
         "metadataContent": string;
         "changeAvatar": string;
         "changeBanner": string;
+        "verifiedLinkDescription": string;
     };
     "_exportOrImport": {
         "allNotes": string;
@@ -2115,9 +2154,14 @@ export interface Locale {
         "youReceivedFollowRequest": string;
         "yourFollowRequestAccepted": string;
         "pollEnded": string;
+        "newNote": string;
         "unreadAntennaNote": string;
         "emptyPushNotificationMessage": string;
         "achievementEarned": string;
+        "testNotification": string;
+        "checkNotificationBehavior": string;
+        "sendTestNotification": string;
+        "notificationWillBeDisplayedLikeThis": string;
         "_types": {
             "all": string;
             "follow": string;
@@ -2156,6 +2200,8 @@ export interface Locale {
         "introduction2": string;
         "widgetsIntroduction": string;
         "useSimpleUiForNonRootPages": string;
+        "usedAsMinWidthWhenFlexible": string;
+        "flexible": string;
         "_columns": {
             "main": string;
             "widgets": string;

locales/it-IT.yml

@@ -21,7 +21,7 @@ noNotifications: "Nessuna notifica"
 instance: "Istanza"
 settings: "Impostazioni"
 notificationSettings: "Preferenze di notifica"
-basicSettings: "Impostazioni generali"
+basicSettings: "Impostazioni base"
 otherSettings: "Altre impostazioni"
 openInWindow: "Apri in una finestra"
 profile: "Profilo"
@@ -45,6 +45,7 @@ pin: "Fissa sul profilo"
 unpin: "Non fissare sul profilo"
 copyContent: "Copia il contenuto"
 copyLink: "Copia il link"
+copyLinkRenote: "Copia collegamento alla Rinota"
 delete: "Elimina"
 deleteAndEdit: "Elimina e modifica"
 deleteAndEditConfirm: "Vuoi davvero cancellare questa nota e scriverla di nuovo? Verranno eliminate anche tutte le reazioni, rinote e risposte collegate."
@@ -63,9 +64,9 @@ reply: "Rispondi"
 loadMore: "Mostra di più"
 showMore: "Espandi"
 showLess: "Comprimi"
-youGotNewFollower: "Ha iniziato a seguirti"
+youGotNewFollower: "Ti sta seguendo"
 receiveFollowRequest: "Hai ricevuto una richiesta di follow"
-followRequestAccepted: "Richiesta di follow accettata"
+followRequestAccepted: "Ha accettato la tua richiesta di follow"
 mention: "Menzioni"
 mentions: "Menzioni"
 directNotes: "Note dirette"
@@ -74,8 +75,8 @@ import: "Importa"
 export: "Esporta"
 files: "Allegati"
 download: "Scarica"
-driveFileDeleteConfirm: "Vuoi davvero eliminare il file \"{name}\"? Anche gli allegati verranno eliminati."
+driveFileDeleteConfirm: "Vuoi davvero eliminare il file \"{name}\", e le Note a cui è stato allegato?"
-unfollowConfirm: "Vuoi smettere di seguire {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. Può volerci tempo. "
 lists: "Liste"
@@ -84,7 +85,7 @@ note: "Nota"
 notes: "Note"
 following: "Follow"
 followers: "Follower"
-followsYou: "Ti segue"
+followsYou: "Segue"
 createList: "Aggiungi una nuova lista"
 manageLists: "Gestisci liste"
 error: "Errore"
@@ -105,7 +106,7 @@ unfollow: "Non seguire"
 followRequestPending: "Richiesta in approvazione"
 enterEmoji: "Inserisci emoji"
 renote: "Rinota"
-unrenote: "Annulla rinota"
+unrenote: "Elimina la Rinota"
 renoted: "Rinotato!"
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
@@ -137,7 +138,7 @@ suspend: "Sospendi"
 unsuspend: "Revoca la sospensione"
 blockConfirm: "Vuoi davvero bloccare il profilo?"
 unblockConfirm: "Vuoi davvero sbloccare il profilo?"
-suspendConfirm: "Vuoi sospendere questo profilo?"
+suspendConfirm: "Vuoi davvero sospendere questo profilo?"
 unsuspendConfirm: "Vuoi revocare la sospensione si questo profilo?"
 selectList: "Seleziona una lista"
 editList: "Modifica Lista"
@@ -156,6 +157,7 @@ addEmoji: "Aggiungi un emoji"
 settingGuide: "Configurazione suggerita"
 cacheRemoteFiles: "Memorizza i file remoti nella cache"
 cacheRemoteFilesDescription: "Disabilitando questa opzione, i file remoti verranno linkati direttamente senza essere memorizzati nella cache. Sarà possibile risparmiare spazio di archiviazione sul server, ma il traffico aumenterà in quanto non verranno generate anteprime."
+youCanCleanRemoteFilesCache: "Puoi svuotare tutta la cache cliccando il bottone 🗑️ nella gestione file"
 cacheRemoteSensitiveFiles: "Memorizza nella cache i file sensibili remoti"
 cacheRemoteSensitiveFilesDescription: "Disattivando questa opzione, i file sensibili verranno caricati direttamente dall'istanza remota senza essere salvati dal server."
 flagAsBot: "Io sono un robot"
@@ -164,7 +166,7 @@ flagAsCat: "Sono un gatto"
 flagAsCatDescription: "La modalità \"sono un gatto\" aggiunge le orecchie al tuo profilo"
 flagShowTimelineReplies: "Mostra le risposte alle note sulla timeline."
 flagShowTimelineRepliesDescription: "Attivando, la timeline mostra le Note del profilo ed anche le risposte ad altre Note"
-autoAcceptFollowed: "Accetta automaticamente le richieste di follow da utenti che già segui"
+autoAcceptFollowed: "Accetta automaticamente le richieste di follow da profili che già segui"
 addAccount: "Aggiungi profilo"
 reloadAccountsList: "Ricarica l'elenco dei profili"
 loginFailed: "Accesso non riuscito"
@@ -254,7 +256,7 @@ imageUrl: "URL dell'immagine"
 remove: "Elimina"
 removed: "Eliminato con successo"
 removeAreYouSure: "Vuoi davvero eliminare \"{x}\"?"
-deleteAreYouSure: "Eliminare \"{x}\"?"
+deleteAreYouSure: "Vuoi davvero eliminare \"{x}\"?"
 resetAreYouSure: "Ripristinare?"
 saved: "Salvato"
 messaging: "Messaggi"
@@ -273,10 +275,10 @@ noMoreHistory: "Non c'è più cronologia da visualizzare"
 startMessaging: "Nuovo messaggio"
 nUsersRead: "Letto da {n} persone"
 agreeTo: "Sono d'accordo con {0}"
-agree: "D'accordo"
+agree: "Accetto"
 agreeBelow: "Accetto quanto riportato sotto"
 basicNotesBeforeCreateAccount: "Note importanti"
-termsOfService: "Informativa Privacy"
+termsOfService: "Informativa ai sensi degli artt. 13 e 14 del Regolamento UE 2016/679 per la protezione dei dati personali (GDPR)"
 start: "Inizia!"
 home: "Home"
 remoteUserCaution: "Le informazioni potrebbero essere incomplete poiché questo profilo remoto potrebbe non essere completamente federato."
@@ -354,7 +356,6 @@ invite: "Invita"
 driveCapacityPerLocalAccount: "Capienza del Drive per profilo locale"
 driveCapacityPerRemoteAccount: "Capienza del Drive per profilo remoto"
 inMb: "in Megabytes"
-iconUrl: "URL di icona (favicon, ecc.)"
 bannerUrl: "URL dell'immagine d'intestazione"
 backgroundImageUrl: "URL dello sfondo"
 basicInfo: "Informazioni fondamentali"
@@ -394,9 +395,9 @@ connectedTo: "Connessione ai seguenti profili:"
 notesAndReplies: "Note e risposte"
 withFiles: "Con file in allegato"
 silence: "Silenzia"
-silenceConfirm: "Vuoi davvero silenziare l'utente?"
+silenceConfirm: "Vuoi davvero silenziare questo profilo?"
 unsilence: "Riattiva"
-unsilenceConfirm: "Vuoi davvero riattivare l'utente?"
+unsilenceConfirm: "Vuoi davvero riattivare questo profilo?"
 popularUsers: "Utenti popolari"
 recentlyUpdatedUsers: "Utenti attivi di recente"
 recentlyRegisteredUsers: "Utenti registrati di recente"
@@ -410,10 +411,13 @@ aboutMisskey: "Informazioni di Misskey"
 administrator: "Amministratore"
 token: "Token"
 2fa: "Autenticazione a due fattori"
+setupOf2fa: "Impostare l'autenticazione a due fattori"
 totp: "App di autenticazione"
 totpDescription: "Inserisci un codice OTP tramite un'app di autenticazione"
 moderator: "Moderatore"
 moderation: "moderazione"
+moderationNote: "Promemoria di moderazione"
+addModerationNote: "Aggiungi promemoria di moderazione"
 nUsersMentioned: "{n} profili menzionati"
 securityKeyAndPasskey: "Chiave di sicurezza e accesso"
 securityKey: "Chiave di sicurezza"
@@ -526,9 +530,9 @@ serverLogs: "Log del server"
 deleteAll: "Cancella cronologia"
 showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
 showFixedPostFormInChannel: "Per i canali, mostra il modulo di pubblicazione in cima alla timeline"
-newNoteRecived: "Vedi le nuove note"
+newNoteRecived: "Nuove note da leggere"
 sounds: "Impostazioni suoni"
-sound: "Impostazioni suoni"
+sound: "Suono"
 listen: "Ascolta"
 none: "Nessuno"
 showInPage: "Visualizza in pagina"
@@ -557,7 +561,7 @@ disablePagesScript: "Disabilita AiScript nelle pagine"
 updateRemoteUser: "Aggiornare le informazioni di utente remot@"
 deleteAllFiles: "Elimina tutti i file"
 deleteAllFilesConfirm: "Vuoi davvero eliminare tutti i file?"
-removeAllFollowing: "Cancella tutti i follows"
+removeAllFollowing: "Annulla tutti i follow"
 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: "L'utente è silenziat@."
@@ -652,9 +656,10 @@ fileIdOrUrl: "ID o URL del file"
 behavior: "Comportamento"
 sample: "Esempio"
 abuseReports: "Segnalazioni"
-reportAbuse: "Segnalazioni"
+reportAbuse: "Segnala"
+reportAbuseRenote: "Segnala la Rinota"
 reportAbuseOf: "Segnala {name}"
-fillAbuseReportDescription: "Si prega di spiegare il motivo della segnalazione. Se riguarda una nota precisa, si prega di collegare anche l'URL della nota."
+fillAbuseReportDescription: "Per favore, spiegaci il motivo della segnalazione. Se riguarda una Nota precisa, indica anche l'indirizzo URL."
 abuseReported: "La segnalazione è stata inviata. Grazie."
 reporter: "il corrispondente"
 reporteeOrigin: "Origine del segnalato"
@@ -680,6 +685,7 @@ createNewClip: "Crea una Clip"
 unclip: "Togli Nota dalla Clip"
 confirmToUnclipAlreadyClippedNote: "Questa nota è già inclusa in \"{name}\". Si desidera escludere la nota?"
 public: "Pubblica"
+private: "Privato"
 i18nInfo: "Misskey è tradotto in diverse lingue da volontari. Anche tu puoi contribuire su {link}."
 manageAccessTokens: "Gestisci token di accesso"
 accountInfo: "Informazioni profilo"
@@ -760,7 +766,7 @@ editCode: "Modifica codice"
 apply: "Applica"
 receiveAnnouncementFromInstance: "Ricevi i messaggi informativi dall'istanza"
 emailNotification: "Eventi per notifiche via mail"
-publish: "Pubblico"
+publish: "Pubblicare"
 inChannelSearch: "Cerca in canale"
 useReactionPickerForContextMenu: "Cliccare sul tasto destro per aprire il pannello di reazioni"
 typingUsers: "{users} sta(nno) scrivendo"
@@ -819,8 +825,8 @@ previewNoteText: "Anteprima del testo"
 customCss: "CSS personalizzato"
 customCssWarn: "Questa impostazione deve essere eseguita da una persona esperta. Una configurazione errata può impedire al client di utilizzare correttamente il sistema."
 global: "Federata"
-squareAvatars: "Mostra l'immagine del profilo come quadrato"
+squareAvatars: "Foto profilo squadrate"
-sent: "Inviare"
+sent: "Inviato"
 received: "Ricevuto"
 searchResult: "Risultati della Ricerca"
 hashtags: "Hashtag"
@@ -829,8 +835,8 @@ useBlurEffect: "Utilizza effetto sfocatura"
 learnMore: "Più dettagli"
 misskeyUpdated: "Misskey è stato aggiornato!"
 whatIsNew: "Visualizza le informazioni sull'aggiornamento"
-translate: "Traduzione"
+translate: "Traduci"
-translatedFrom: "Tradotto da {x}"
+translatedFrom: "Traduzione da {x}"
 accountDeletionInProgress: "È in corso l'eliminazione del profilo"
 usernameInfo: "Un nome per identificare univocamente il tuo profilo sull'istanza. Puoi utilizzare caratteri alfanumerici maiuscoli, minuscoli e il trattino basso (_). Non potrai cambiare nome utente in seguito."
 aiChanMode: "Modalità Ai"
@@ -840,8 +846,8 @@ pubSub: "Publish/Subscribe del profilo"
 lastCommunication: "La comunicazione più recente"
 resolved: "Risolto"
 unresolved: "Non risolto"
-breakFollow: "Non seguire"
+breakFollow: "Non farti più seguire"
-breakFollowConfirm: "Vuoi davvero togliere follower?"
+breakFollowConfirm: "Vuoi davvero smettere di seguire questo profilo?"
 itsOn: "Abilitato"
 itsOff: "Disabilitato"
 on: "Acceso"
@@ -854,11 +860,11 @@ manageAccounts: "Gestisci i profili"
 makeReactionsPublic: "Pubblicare la lista delle reazioni."
 makeReactionsPublicDescription: "La lista delle reazioni che avete fatto è a disposizione di tutti."
 classic: "Classico"
-muteThread: "Silenzia la conversazione"
+muteThread: "Silenzia conversazione"
 unmuteThread: "Riattiva la conversazione"
 ffVisibility: "Visibilità delle connessioni"
 ffVisibilityDescription: "Puoi scegliere a chi mostrare le tue relazioni con altri profili nel fediverso."
-continueThread: "Altri thread."
+continueThread: "Altre conversazioni"
 deleteAccountConfirm: "Così verrà eliminato il profilo. Vuoi procedere?"
 incorrectPassword: "La password è errata."
 voteConfirm: "Votare per「{choice}」?"
@@ -1018,7 +1024,7 @@ retryAllQueuesConfirmText: "Potrebbe sovraccaricare il server temporaneamente."
 enableChartsForRemoteUser: "Abilita i grafici per i profili remoti"
 enableChartsForFederatedInstances: "Abilita i grafici per le istanze federate"
 showClipButtonInNoteFooter: "Aggiungi il bottone Clip tra le azioni delle Note"
-largeNoteReactions: "Ingrandisci le reazioni"
+reactionsDisplaySize: "Grandezza delle reazioni"
 noteIdOrUrl: "ID della Nota o URL"
 video: "Video"
 videos: "Video"
@@ -1030,8 +1036,8 @@ operationForbidden: "Operazione non consentita"
 forceShowAds: "Mostra sempre i banner"
 addMemo: "Aggiungi Memo"
 editMemo: "Modifica Memo"
-reactionsList: "Elenco delle reazioni"
+reactionsList: "Chi ha reagito?"
-renotesList: "Elenco di Rinota"
+renotesList: "Chi ha Rinotato?"
 notificationDisplay: "Stile delle notifiche"
 leftTop: "In alto a sinistra"
 rightTop: "In alto a destra"
@@ -1042,8 +1048,8 @@ vertical: "Verticale"
 horizontal: "Laterale"
 position: "Posizione"
 serverRules: "Regolamento"
-pleaseConfirmBelowBeforeSignup: "Ai sensi del regolamento EU 679/2016 GDPR, autorizzo il trattamento dati personali come descritto nella informativa Privacy."
+pleaseConfirmBelowBeforeSignup: "Per iscriversi, occorre essere d'accordo con le seguenti condizioni."
-pleaseAgreeAllToContinue: "Per continuare, occorre selezionare ed essere d'accordo su tutto."
+pleaseAgreeAllToContinue: "Occorre accettare tutte le condizioni prima di continuare."
 continue: "Continua"
 preservedUsernames: "Nomi utente riservati"
 preservedUsernamesDescription: "Elenca, uno per linea, i nomi utente che non possono essere registrati durante la creazione del profilo. La restrizione non si applica agli amministratori. Inoltre, i profili già registrati sono esenti."
@@ -1082,7 +1088,7 @@ inviteLimitExceeded: "Hai raggiunto il numero massimo di codici invito generabil
 createLimitRemaining: "Inviti generabili: {limit} rimanenti"
 inviteLimitResetCycle: "Alle {time}, il limite verrà ripristinato a {limit}"
 expirationDate: "Scadenza"
-noExpirationDate: "Perpetuo"
+noExpirationDate: "Senza scadenza"
 inviteCodeUsedAt: "Codice di invito usato alle"
 registeredUserUsingInviteCode: "Codice di invito usato da"
 waitingForMailAuth: "In attesa della verifica email"
@@ -1091,9 +1097,30 @@ usedAt: "Usato alle"
 unused: "Inutilizzato"
 used: "Utilizzato"
 expired: "Scaduto"
-doYouAgree: "Sei d'accordo?"
+doYouAgree: "Accetti le condizioni?"
 beSureToReadThisAsItIsImportant: "Si prega di leggere attentamente perché è importante."
-iHaveReadXCarefullyAndAgree: "Ho letto accuratamente \"{x}\" e sono d'accordo."
+iHaveReadXCarefullyAndAgree: "Dichiaro di aver letto attentamente \"{x}\" e accettarne le condizioni."
+dialog: "Dialogo"
+icon: "Ritratto"
+forYou: "Per te"
+currentAnnouncements: "Annunci attuali"
+pastAnnouncements: "Annunci precedenti"
+youHaveUnreadAnnouncements: "Ci sono Annunci non letti"
+useSecurityKey: "Per utilizzare la chiave di sicurezza o la passkey, segui le indicazioni del dispositivo"
+replies: "Rispondi"
+renotes: "Rinota"
+loadReplies: "Leggi le risposte"
+loadConversation: "Leggi la conversazione"
+pinnedList: "Elenco in primo piano"
+_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: "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}˝?"
 _initialAccountSetting:
   accountCreated: "Il tuo profilo è stato creato!"
   letsStartAccountSetup: "Per iniziare, impostiamo il tuo profilo."
@@ -1111,6 +1138,13 @@ _initialAccountSetting:
   laterAreYouSure: "Vuoi davvero rimandare la configurazione iniziale?"
 _serverRules:
   description: "In Europa è necessario mostrare l'informativa sul trattamento dei dati personali, prima della registrazione al servizio."
+_serverSettings:
+  iconUrl: "URL dell'icona"
+  appIconDescription: "Indicare l'icona da usare quando {host} viene salvata come App."
+  appIconUsageExample: "Ad esempio quando si aggiunge il segnalibro alla PWA (Progressive Web App), oppure alla schermata iniziale del dispositivo mobile "
+  appIconStyleRecommendation: "Poiché l'icona potrebbe essere ritagliata in un quadrato o in un cerchio, si raccomanda che abbia un margine colorato."
+  appIconResolutionMustBe: "La risoluzione minima è {resolution}"
+  manifestJsonOverride: "Sostituire il file manifest.json"
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
   moveFromSub: "Crea un alias verso un altro profilo remoto"
@@ -1365,6 +1399,9 @@ _achievements:
       title: "Brain Diver"
       description: "Pubblica un link a Brain Diver"
       flavor: "Sulle note di Brain Diver"
+    _smashTestNotificationButton:
+      title: "Prove eccessive"
+      description: "Hai provato le notifiche consecutivamente in un periodo di tempo molto breve"
 _role:
   new: "Nuovo ruolo"
   edit: "Modifica ruolo"
@@ -1451,7 +1488,7 @@ _emailUnavailable:
   mx: "Server email non corretto"
   smtp: "Il server email non risponde"
 _ffVisibility:
-  public: "Pubblico"
+  public: "Pubblica"
   followers: "Mostra solo ai follower"
   private: "Invisibile"
 _signup:
@@ -1489,11 +1526,11 @@ _plugin:
   installWarn: "Si prega di installare soltanto estensioni che provengono da fonti affidabili."
   manage: "Gestisci estensioni"
 _preferencesBackups:
-  list: "I backup creati."
+  list: "Elenco di impostazioni salvate in precedenza"
   saveNew: "Nuovo salvataggio"
-  loadFile: "Importa file"
+  loadFile: "Carica da file"
   apply: "Applicabile a questo dispositivo"
-  save: "Sovrascrivi il file di salvataggio"
+  save: "Sovrascrivi il backup"
   inputName: "Inserire il nome del backup."
   cannotSave: "Impossibile salvare."
   nameAlreadyExists: "Il nome del backup \"{name}\" esiste già. Si prega di specificare un nome diverso."
@@ -1679,14 +1716,14 @@ _2fa:
   step1: "Innanzitutto, installare sul dispositivo un'applicazione di autenticazione come {a} o {b}."
   step2: "Quindi, scansionare il codice QR visualizzato con l'app."
   step2Click: "Cliccando sul codice QR, puoi registrarlo con l'app di autenticazione o il portachiavi installato sul tuo dispositivo."
-  step2Url: "Nell'applicazione desktop inserire il seguente URL: "
+  step2Uri: "Inserisci il seguente URL se desideri utilizzare una App per PC"
   step3Title: "Inserisci il codice di verifica"
   step3: "Inserite il token visualizzato nell'app e il gioco è fatto."
+  setupCompleted: "Impostazione completata"
   step4: "D'ora in poi, quando si accede, si inserisce il token nello stesso modo."
   securityKeyNotSupported: "Il tuo browser non supporta le chiavi di sicurezza."
   registerTOTPBeforeKey: "Ti occorre un'app di autenticazione con OTP, prima di registrare la chiave di sicurezza."
   securityKeyInfo: "È possibile impostare il dispositivo per accedere utilizzando una chiave di sicurezza hardware che supporta FIDO2 o un'impronta digitale o un PIN sul dispositivo."
-  chromePasskeyNotSupported: "Le passkey di Chrome non sono attualmente supportate."
   registerSecurityKey: "Registra la chiave di sicurezza"
   securityKeyName: "Inserisci il nome della chiave"
   tapSecurityKey: "Segui le istruzioni del browser e registra la chiave di sicurezza."
@@ -1697,6 +1734,11 @@ _2fa:
   renewTOTPConfirm: "I codici di verifica nelle app di autenticazione esistenti smetteranno di funzionare"
   renewTOTPOk: "Ripristina"
   renewTOTPCancel: "No grazie"
+  checkBackupCodesBeforeCloseThisWizard: "Prima di chiudere questa procedura guidata, salva i tuoi codici usa-e-getta in un posto sicuro."
+  backupCodes: "Codici usa-e-getta"
+  backupCodesDescription: "Puoi usare questi codici usa-e-getta per ottenere l'accesso al tuo profilo in caso sia impossibile usare l'App col codice OTP. Salvali in un posto sicuro."
+  backupCodeUsedWarning: "È stato usato un codice usa-e-getta. Per favore, riconfigura l'autenticazione a due fattori il prima possibile, nel caso la configurazione precedente abbia smesso di funzionare."
+  backupCodesExhaustedWarning: "Hai esaurito i codici usa-e-getta. Se l'App che genera il codice OTP non è più disponibile, non potrai più accedere al tuo profilo. Ripeti la configurazione per l'autenticazione a due fattori."
 _permissions:
   "read:account": "Visualizza le informazioni sul profilo"
   "write:account": "Modifica le informazioni sul profilo"
@@ -1730,6 +1772,10 @@ _permissions:
   "write:gallery": "Gestione della galleria"
   "read:gallery-likes": "Visualizza i contenuti della galleria."
   "write:gallery-likes": "Manipolazione dei \"Mi piace\" della galleria."
+  "read:flash": "Visualizza Play"
+  "write:flash": "Modifica Play"
+  "read:flash-likes": "Visualizza lista di Play piaciuti"
+  "write:flash-likes": "Modifica lista di Play piaciuti"
 _auth:
   shareAccessTitle: "Permessi dell'applicazione"
   shareAccess: "Vuoi autorizzare {name} ad accedere al tuo profilo?"
@@ -1965,6 +2011,10 @@ _notification:
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Le notifiche push sono state aggiornate."
   achievementEarned: "Obiettivo raggiunto"
+  testNotification: "Prova la notifica"
+  checkNotificationBehavior: "Prova il comportamento della notifica"
+  sendTestNotification: "Spedisci una notifica di prova"
+  notificationWillBeDisplayedLikeThis: "La notifica apparirà così"
   _types:
     all: "Tutto"
     follow: "Novità follower"
@@ -1986,7 +2036,7 @@ _deck:
   alwaysShowMainColumn: "Mostra sempre la colonna principale"
   columnAlign: "Allineare colonne"
   addColumn: "Aggiungi colonna"
-  configureColumn: "Impostazioni della colonna."
+  configureColumn: "Impostazioni colonna"
   swapLeft: "Sposta a sinistra"
   swapRight: "Sposta a destra"
   swapUp: "Sposta in alto"
@@ -2000,6 +2050,8 @@ _deck:
   introduction2: "È possibile aggiungere colonne in qualsiasi momento premendo + sulla destra dello schermo."
   widgetsIntroduction: "Dal menu della colonna, selezionare \"Modifica i riquadri\" per aggiungere un un riquadro con funzionalità"
   useSimpleUiForNonRootPages: "Visualizza sotto pagine con interfaccia web semplice"
+  usedAsMinWidthWhenFlexible: "Se \"larghezza flessibile\" è abilitato, questa diventa la larghezza minima"
+  flexible: "Larghezza flessibile"
   _columns:
     main: "Principale"
     widgets: "Riquadri"

locales/ja-JP.yml

@@ -15,7 +15,7 @@ gotIt: "わかった"
 cancel: "キャンセル"
 noThankYou: "やめておく"
 enterUsername: "ユーザー名を入力"
-renotedBy: "{user}がRenote"
+renotedBy: "{user}がリノート"
 noNotes: "ノートはありません"
 noNotifications: "通知はありません"
 instance: "サーバー"
@@ -45,9 +45,10 @@ pin: "ピン留め"
 unpin: "ピン留め解除"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
+copyLinkRenote: "リノートのリンクをコピー"
 delete: "削除"
 deleteAndEdit: "削除して編集"
-deleteAndEditConfirm: "このノートを削除してもう一度編集しますか？このノートへのリアクション、Renote、返信も全て削除されます。"
+deleteAndEditConfirm: "このノートを削除してもう一度編集しますか？このノートへのリアクション、リノート、返信も全て削除されます。"
 addToList: "リストに追加"
 addToAntenna: "アンテナに追加"
 sendMessage: "メッセージを送信"
@@ -104,13 +105,13 @@ followRequests: "フォロー申請"
 unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
-renote: "Renote"
+renote: "リノート"
-unrenote: "Renote解除"
+unrenote: "リノート解除"
-renoted: "Renoteしました。"
+renoted: "リノートしました。"
-cantRenote: "この投稿はRenoteできません。"
+cantRenote: "この投稿はリノートできません。"
-cantReRenote: "RenoteをRenoteすることはできません。"
+cantReRenote: "リノートをリノートすることはできません。"
 quote: "引用"
-inChannelRenote: "チャンネル内Renote"
+inChannelRenote: "チャンネル内リノート"
 inChannelQuote: "チャンネル内引用"
 pinnedNote: "ピン留めされたノート"
 pinned: "ピン留め"
@@ -355,7 +356,6 @@ invite: "招待"
 driveCapacityPerLocalAccount: "ローカルユーザーひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのドライブ容量"
 inMb: "メガバイト単位"
-iconUrl: "アイコン画像のURL (faviconなど)"
 bannerUrl: "バナー画像のURL"
 backgroundImageUrl: "背景画像のURL"
 basicInfo: "基本情報"
@@ -411,10 +411,13 @@ aboutMisskey: "Misskeyについて"
 administrator: "管理者"
 token: "確認コード"
 2fa: "二要素認証"
+setupOf2fa: "二要素認証のセットアップ"
 totp: "認証アプリ"
 totpDescription: "認証アプリを使ってワンタイムパスワードを入力"
 moderator: "モデレーター"
 moderation: "モデレーション"
+moderationNote: "モデレーションノート"
+addModerationNote: "モデレーションノートを追加する"
 nUsersMentioned: "{n}人が投稿"
 securityKeyAndPasskey: "セキュリティキー・パスキー"
 securityKey: "セキュリティキー"
@@ -654,6 +657,7 @@ behavior: "動作"
 sample: "サンプル"
 abuseReports: "通報"
 reportAbuse: "通報"
+reportAbuseRenote: "リノートを通報"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
@@ -681,14 +685,15 @@ createNewClip: "新しいクリップを作成"
 unclip: "クリップ解除"
 confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれています。ノートをこのクリップから除外しますか？"
 public: "パブリック"
+private: "非公開"
 i18nInfo: "Misskeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。"
 manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
 notesCount: "ノートの数"
 repliesCount: "返信した数"
-renotesCount: "Renoteした数"
+renotesCount: "リノートした数"
 repliedCount: "返信された数"
-renotedCount: "Renoteされた数"
+renotedCount: "リノートされた数"
 followingCount: "フォロー数"
 followersCount: "フォロワー数"
 sentReactionsCount: "リアクションした数"
@@ -705,6 +710,7 @@ lockedAccountInfo: "フォローを承認制にしても、ノートの公開範
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
+highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
 notSet: "未設定"
 emailVerified: "メールアドレスが確認されました"
@@ -984,7 +990,7 @@ thisPostMayBeAnnoying: "この投稿は迷惑になる可能性があります
 thisPostMayBeAnnoyingHome: "ホームに投稿"
 thisPostMayBeAnnoyingCancel: "やめる"
 thisPostMayBeAnnoyingIgnore: "このまま投稿"
-collapseRenotes: "見たことのあるRenoteを省略して表示"
+collapseRenotes: "見たことのあるリノートを省略して表示"
 internalServerError: "サーバー内部エラー"
 internalServerErrorDescription: "サーバー内部で予期しないエラーが発生しました。"
 copyErrorInfo: "エラー情報をコピー"
@@ -1019,7 +1025,7 @@ retryAllQueuesConfirmText: "一時的にサーバーの負荷が増大するこ
 enableChartsForRemoteUser: "リモートユーザーのチャートを生成"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを生成"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
-largeNoteReactions: "ノートのリアクションを大きく表示"
+reactionsDisplaySize: "リアクションの表示サイズ"
 noteIdOrUrl: "ノートIDまたはURL"
 video: "動画"
 videos: "動画"
@@ -1032,7 +1038,7 @@ forceShowAds: "常に広告を表示する"
 addMemo: "メモを追加"
 editMemo: "メモを編集"
 reactionsList: "リアクション一覧"
-renotesList: "Renote一覧"
+renotesList: "リノート一覧"
 notificationDisplay: "通知の表示"
 leftTop: "左上"
 rightTop: "右上"
@@ -1101,6 +1107,18 @@ forYou: "あなたへ"
 currentAnnouncements: "現在のお知らせ"
 pastAnnouncements: "過去のお知らせ"
 youHaveUnreadAnnouncements: "未読のお知らせがあります。"
+useSecurityKey: "ブラウザまたはデバイスの指示に従って、セキュリティキーまたはパスキーを使用してください。"
+replies: "返信"
+renotes: "リノート"
+loadReplies: "返信を見る"
+loadConversation: "会話を見る"
+pinnedList: "ピン留めされたリスト"
+keepScreenOn: "デバイスの画面を常にオンにする"
+verifiedLink: "このリンク先の所有者であることが確認されました"
+notifyNotes: "投稿を通知"
+unnotifyNotes: "投稿の通知を解除"
+authentication: "認証"
+authenticationRequiredToContinue: "続けるには認証を行ってください"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"
@@ -1131,6 +1149,14 @@ _initialAccountSetting:
 _serverRules:
   description: "新規登録前に表示する、サーバーの簡潔なルールを設定します。内容は利用規約の要約とすることを推奨します。"
 
+_serverSettings:
+  iconUrl: "アイコン画像のURL"
+  appIconDescription: "{host}がアプリとして表示される際のアイコンを指定します。"
+  appIconUsageExample: "例: PWAや、スマートフォンのホーム画面にブックマークとして追加された時など"
+  appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるため、塗り潰された余白のある背景を持つことが推奨されます。"
+  appIconResolutionMustBe: "解像度は必ず{resolution}である必要があります。"
+  manifestJsonOverride: "manifest.jsonのオーバーライド"
+
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに移行"
   moveFromSub: "別のアカウントへエイリアスを作成"
@@ -1386,6 +1412,9 @@ _achievements:
       title: "Brain Diver"
       description: "Brain Diverへのリンクを投稿した"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "テスト過剰"
+      description: "通知のテストをごく短時間のうちに連続して行った"
 
 _role:
   new: "ロールの作成"
@@ -1724,18 +1753,17 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"
   registerTOTP: "認証アプリの設定を開始"
-  passwordToTOTP: "パスワードを入力してください"
   step1: "まず、{a}や{b}などの認証アプリをお使いのデバイスにインストールします。"
   step2: "次に、表示されているQRコードをアプリでスキャンします。"
   step2Click: "QRコードをクリックすると、お使いの端末にインストールされている認証アプリやキーリングに登録できます。"
-  step2Url: "デスクトップアプリでは次のURIを入力します:"
+  step2Uri: "デスクトップアプリを使用する場合は次のURIを入力します"
   step3Title: "確認コードを入力"
-  step3: "アプリに表示されている確認コード（トークン）を入力して完了です。"
+  step3: "アプリに表示されている確認コード（トークン）を入力します。"
-  step4: "これからログインするときも、同じように確認コードを入力します。"
+  setupCompleted: "設定が完了しました"
+  step4: "これからログインするときも、同じようにコードを入力します。"
   securityKeyNotSupported: "お使いのブラウザはセキュリティキーに対応していません。"
   registerTOTPBeforeKey: "セキュリティキー・パスキーを登録するには、まず認証アプリの設定を行なってください。"
   securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキー、端末の生体認証やPINロック、パスキーといった、WebAuthn由来の鍵を登録します。"
-  chromePasskeyNotSupported: "Chromeのパスキーは現在サポートしていません。"
   registerSecurityKey: "セキュリティキー・パスキーを登録する"
   securityKeyName: "キーの名前を入力"
   tapSecurityKey: "ブラウザの指示に従い、セキュリティキーやパスキーを登録してください"
@@ -1743,9 +1771,14 @@ _2fa:
   removeKeyConfirm: "{name}を削除しますか？"
   whyTOTPOnlyRenew: "セキュリティキーが登録されている場合、認証アプリの設定は解除できません。"
   renewTOTP: "認証アプリを再設定"
-  renewTOTPConfirm: "今までの認証アプリの確認コードは使用できなくなります"
+  renewTOTPConfirm: "今までの認証アプリの確認コードおよびバックアップコードは使用できなくなります"
   renewTOTPOk: "再設定する"
   renewTOTPCancel: "やめておく"
+  checkBackupCodesBeforeCloseThisWizard: "このウィザードを閉じる前に、以下のバックアップコードを確認してください。"
+  backupCodes: "バックアップコード"
+  backupCodesDescription: "認証アプリが使用できなくなった場合、以下のバックアップコードを使ってアカウントにアクセスできます。これらのコードは必ず安全な場所に保管してください。各コードは一回だけ使用できます。"
+  backupCodeUsedWarning: "バックアップコードが使用されました。認証アプリが使えなくなっている場合、なるべく早く認証アプリを再設定してください。"
+  backupCodesExhaustedWarning: "バックアップコードが全て使用されました。認証アプリを利用できない場合、これ以上アカウントにアクセスできなくなります。認証アプリを再登録してください。"
 
 _permissions:
   "read:account": "アカウントの情報を見る"
@@ -1780,6 +1813,10 @@ _permissions:
   "write:gallery": "ギャラリーを操作する"
   "read:gallery-likes": "ギャラリーのいいねを見る"
   "write:gallery-likes": "ギャラリーのいいねを操作する"
+  "read:flash": "Playを見る"
+  "write:flash": "Playを操作する"
+  "read:flash-likes": "Playのいいねを見る"
+  "write:flash-likes": "Playのいいねを操作する"
 
 _auth:
   shareAccessTitle: "アプリへのアクセス許可"
@@ -1903,6 +1940,7 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アイコン画像を変更"
   changeBanner: "バナー画像を変更"
+  verifiedLinkDescription: "内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。"
 
 _exportOrImport:
   allNotes: "全てのノート"
@@ -2030,9 +2068,14 @@ _notification:
   youReceivedFollowRequest: "フォローリクエストが来ました"
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
   pollEnded: "アンケートの結果が出ました"
+  newNote: "新しい投稿"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
   achievementEarned: "実績を獲得"
+  testNotification: "通知テスト"
+  checkNotificationBehavior: "通知の表示を確かめる"
+  sendTestNotification: "テスト通知を送信する"
+  notificationWillBeDisplayedLikeThis: "通知はこのように表示されます"
 
   _types:
     all: "すべて"
@@ -2071,6 +2114,8 @@ _deck:
   introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。"
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください"
   useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
+  usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となります"
+  flexible: "幅を自動調整"
 
   _columns:
     main: "メイン"

locales/ja-KS.yml

@@ -76,7 +76,7 @@ files: "ファイル"
 download: "ダウンロード"
 driveFileDeleteConfirm: "ファイル「{name}」をほかしてええか？このファイルを添付したノートも消えてまうで。"
 unfollowConfirm: "{name}のフォローを解除してもええんか？"
-exportRequested: "エクスポートしてな、ってリクエストしたけど、これ多分めっちゃ時間かかるで。エクスポート終わったら「ドライブ」に突っ込んどくで。"
+exportRequested: "エクスポートしてな、って言うたけど、これ多分めっちゃ時間かかるで。エクスポート終わったら「ドライブ」に突っ込んどくで。"
 importRequested: "インポートしてな、ってリクエストしたけど、これ多分めっちゃ時間かかるで。"
 lists: "リスト"
 noLists: "リストなんてあらへんで"
@@ -156,6 +156,7 @@ addEmoji: "絵文字を追加"
 settingGuide: "ええ感じの設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を切っとったら、リモートファイルをキャッシュせんと直リンクするようになるで。サーバーの容量は節約できるけど、サムネイルを作らんなるから通信量が増えるで。"
+youCanCleanRemoteFilesCache: "ファイル管理にある🗑️ボタンでキャッシュ全部ほかすで。"
 cacheRemoteSensitiveFiles: "リモートのセンシティブなファイルをキャッシュする"
 cacheRemoteSensitiveFilesDescription: "この設定を無効にすると、リモートのセンシティブなファイルはキャッシュせず直リンクするようになるで。"
 flagAsBot: "Botにするで"
@@ -354,7 +355,6 @@ invite: "来てや"
 driveCapacityPerLocalAccount: "ローカルユーザーはんひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーはんひとりあたりのドライブ容量"
 inMb: "メガバイト単位"
-iconUrl: "アイコン画像のURL"
 bannerUrl: "バナー画像のURL"
 backgroundImageUrl: "背景画像のURL"
 basicInfo: "基本情報"
@@ -414,6 +414,8 @@ totp: "認証アプリ"
 totpDescription: "認証アプリ使うてワンタイムパスワードを入れる"
 moderator: "モデレーター"
 moderation: "モデレーション"
+moderationNote: "モデレーションノート"
+addModerationNote: "モデレーションノートを追加するで"
 nUsersMentioned: "{n}人が投稿"
 securityKeyAndPasskey: "セキュリティキー・パスキー"
 securityKey: "セキュリティキー"
@@ -680,6 +682,7 @@ createNewClip: "新しいクリップを作るで"
 unclip: "クリップ解除するで"
 confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれとるで。ノートをこのクリップから除外しよか？"
 public: "パブリック"
+private: "非公開"
 i18nInfo: "Misskeyは有志によっていろんな言語に翻訳されとるで。{link}で翻訳に協力したってやー。"
 manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
@@ -699,7 +702,7 @@ no: "あかん"
 driveFilesCount: "ドライブのファイル数"
 driveUsage: "ドライブ使用量やで"
 noCrawle: "クローラーによるインデックスを拒否するで"
-noCrawleDescription: "検索エンジンにあんたのユーザーページ、ノート、Pagesとかのコンテンツを登録(インデックス)せぇへんように頼むで。"
+noCrawleDescription: "検索エンジンにあんたのユーザーページ、ノート、Pagesとかのコンテンツを登録(インデックス)せんように頼むで。邪魔すんねんやったら帰って〜。"
 lockedAccountInfo: "フォローを承認制にしとっても、ノートの公開範囲を「フォロワー」にせぇへん限り、誰でもあんたのノートを見れるで。"
 alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にするで"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にするで"
@@ -745,7 +748,7 @@ value: "値"
 createdAt: "作成した日"
 updatedAt: "更新日時"
 saveConfirm: "保存するで？"
-deleteConfirm: "ホンマに削除するで？"
+deleteConfirm: "ホンマにほかすで？"
 invalidValue: "有効な値じゃないみたいやで。"
 registry: "レジストリ"
 closeAccount: "アカウントを閉鎖する"
@@ -1018,7 +1021,6 @@ retryAllQueuesConfirmText: "一時的にサーバー重なるかもしれへん
 enableChartsForRemoteUser: "リモートユーザーのチャートを作る"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを作る"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
-largeNoteReactions: "ノートのツッコミを大きする"
 noteIdOrUrl: "ノートIDかURL"
 video: "動画"
 videos: "動画"
@@ -1070,7 +1072,7 @@ later: "あとで"
 goToMisskey: "Misskeyへ"
 additionalEmojiDictionary: "絵文字の追加辞書"
 installed: "インストール済み"
-branding: "あ"
+branding: "ブランディング"
 enableServerMachineStats: "サーバーのマシン情報見せびらかすで"
 enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする"
 turnOffToImprovePerformance: "オフにしたらえらい軽うなるで。"
@@ -1094,6 +1096,24 @@ expired: "期限切れ"
 doYouAgree: "同意するんか？"
 beSureToReadThisAsItIsImportant: "重要やから絶対読んでや。"
 iHaveReadXCarefullyAndAgree: "「{x}」の内容をよう読んで、同意するで。"
+dialog: "ダイアログ"
+icon: "アイコン"
+forYou: "あんたへ"
+currentAnnouncements: "現在のお知らせやで"
+pastAnnouncements: "過去のお知らせやで"
+youHaveUnreadAnnouncements: "あんたまだこのお知らせ読んどらんやろ。"
+useSecurityKey: "ブラウザまたはデバイスの言う通りに、セキュリティキーまたはパスキーを使ってや。"
+replies: "返事"
+renotes: "Renote"
+_announcement:
+  forExistingUsers: "もうおるユーザーのみ"
+  forExistingUsersDescription: "有効にすると、このお知らせ作成時点でおるユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。"
+  needConfirmationToRead: "既読にするのに確認が必要やで"
+  needConfirmationToReadDescription: "有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。また、一括既読操作の対象にもなりません。"
+  end: "お知らせを終了"
+  tooManyActiveAnnouncementDescription: "アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討した方がええよ。"
+  readConfirmTitle: "既読にしてええんやな?"
+  readConfirmText: "「{title}」の内容を読み、既読にします。"
 _initialAccountSetting:
   accountCreated: "アカウント作り終わったで。"
   letsStartAccountSetup: "アカウントの初期設定をしよか。"
@@ -1111,6 +1131,8 @@ _initialAccountSetting:
   laterAreYouSure: "初期設定あとでやり直すん？"
 _serverRules:
   description: "新規登録前に見せる、サーバーの簡潔なルールを設定すんで。内容は使うための決め事の要約とすることを推奨するわ。"
+_serverSettings:
+  iconUrl: "アイコン画像のURL"
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
   moveFromSub: "別のアカウントへエイリアスを作る"
@@ -1679,14 +1701,12 @@ _2fa:
   step1: "ほんなら、{a}や{b}とかの認証アプリを使っとるデバイスにインストールしてな。"
   step2: "次に、ここにあるQRコードをアプリでスキャンしてな～。"
   step2Click: "QRコードをクリックすると、今使とる端末に入っとる認証アプリとかキーリングに登録できるで。"
-  step2Url: "デスクトップアプリやったら次のURLを入力してや:"
   step3Title: "確認コードを入れてーや"
   step3: "アプリに表示されているトークンを入力して終わりや。"
   step4: "これからログインするときも、同じようにトークンを入力するんやで"
   securityKeyNotSupported: "今使とるブラウザはセキュリティキーに対応してへんのやってさ。"
   registerTOTPBeforeKey: "セキュリティキー・パスキーを登録するんやったら、まず認証アプリを設定してーな。"
   securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーか端末の指紋認証やPINを使ってログインするように設定できるで。"
-  chromePasskeyNotSupported: "Chromeのパスキーは今んとこ対応してないねん。"
   registerSecurityKey: "セキュリティキー・パスキーを登録するわ"
   securityKeyName: "キーの名前を入れてーや"
   tapSecurityKey: "ブラウザが言うこと聞いて、セキュリティキーとかパスキー登録しといでや"
@@ -1694,7 +1714,7 @@ _2fa:
   removeKeyConfirm: "{name}を消すん？"
   whyTOTPOnlyRenew: "セキュリティキーが登録されとったら、認証アプリの設定は解除できへんで。"
   renewTOTP: "認証アプリをもっかい設定"
-  renewTOTPConfirm: "今までの人称アプリの確認コードは使えんくなるけどええか？"
+  renewTOTPConfirm: "今までの認証アプリの確認コードは使えんくなるけどええか？"
   renewTOTPOk: "もっかい設定する"
   renewTOTPCancel: "やめとく"
 _permissions:
@@ -1730,6 +1750,10 @@ _permissions:
   "write:gallery": "ギャラリーを操作するで"
   "read:gallery-likes": "ギャラリーのいいねを見るで"
   "write:gallery-likes": "ギャラリーのいいねを操作するで"
+  "read:flash": "Playを見る"
+  "write:flash": "Playを操作する"
+  "read:flash-likes": "Playのええやん！を見る"
+  "write:flash-likes": "Playのええやん！を見る"
 _auth:
   shareAccessTitle: "アプリへのアクセス許してやったらどうや"
   shareAccess: "「{name}」がアカウントにアクセスすることを許可してええか？"

locales/jbo-EN.yml

@@ -1 +1,3 @@
 ---
+_lang_: "la .lojban."
+headlineMisskey: "lo se tcana noi jorne fi loi notci"

locales/kab-KAB.yml

@@ -56,6 +56,7 @@ accounts: "Imiḍan"
 searchByGoogle: "Nadi"
 file: "Ifuyla"
 account: "Imiḍan"
+replies: "Err"
 _email:
   _follow:
     title: "Yeṭṭafaṛ-ik·em-id"

locales/kn-IN.yml

@@ -61,6 +61,7 @@ smtpPass: "ಗುಪ್ತಪದ"
 user: "ಬಳಕೆದಾರ"
 searchByGoogle: "ಹುಡುಕು"
 file: "ಕಡತಗಳು"
+replies: "ಉತ್ತರಿಸು"
 _email:
   _follow:
     title: "ಹಿಂಬಾಲಿಸಿದರು"

locales/ko-KR.yml

@@ -2,20 +2,20 @@
 _lang_: "한국어"
 headlineMisskey: "노트로 연결되는 네트워크"
 introMisskey: "환영합니다! Misskey는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n'노트'를 작성해서 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n'리액션' 기능으로 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
-poweredByMisskeyDescription: "{name}은(는) 오픈소스 플랫폼 <b>Misskey</b>를 사용한 서버 가운데 하나입니다."
+poweredByMisskeyDescription: "{name}은(는) 오픈소스 플랫폼<b>Misskey</b>를 사용한 서비스(Misskey 인스턴스라고 불립니다) 중 하나입니다."
 monthAndDay: "{month}월 {day}일"
 search: "검색"
 notifications: "알림"
 username: "유저명"
 password: "비밀번호"
 forgotPassword: "비밀번호 재설정"
-fetchingAsApObject: "연합에서 조회 중"
+fetchingAsApObject: "연합에 조회 중"
 ok: "확인"
 gotIt: "알겠어요"
 cancel: "취소"
 noThankYou: "나중에"
 enterUsername: "유저명 입력"
-renotedBy: "{user}님의 리노트"
+renotedBy: "{user}님이 리노트"
 noNotes: "노트가 없습니다"
 noNotifications: "표시할 알림이 없습니다"
 instance: "서버"
@@ -45,6 +45,7 @@ pin: "프로필에 고정"
 unpin: "프로필에서 고정 해제"
 copyContent: "내용 복사"
 copyLink: "링크 복사"
+copyLinkRenote: "Renote 링크 복사"
 delete: "삭제"
 deleteAndEdit: "삭제 후 편집"
 deleteAndEditConfirm: "이 노트를 삭제한 뒤 다시 편집하시겠습니까? 이 노트에 대한 리액션, 리노트, 답글 또한 모두 삭제됩니다."
@@ -155,7 +156,8 @@ emojiUrl: "이모지 URL"
 addEmoji: "이모지 추가"
 settingGuide: "추천 설정"
 cacheRemoteFiles: "리모트 파일을 캐시"
-cacheRemoteFilesDescription: "이 설정을 해지하면 리모트 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다."
+cacheRemoteFilesDescription: "이 설정을 활성화하면 리모트 파일을 이 서버의 스토리지에 캐시합니다. 미디어의 표시가 빨라지지만, 서버의 저장 용량을 크게 소모합니다. 리모트 유저의 미디어를 얼마나 보관할 지는 역할의 드라이브 용량 제한에 따라 결정되며, 정해진 용량을 넘길 경우 오래된 파일부터 차례대로 삭제한 뒤 링크로 전환합니다. \n비활성화하면 리모트 파일을 직접 링크하며, 이 경우 이미지 썸네일 생성 및 유저 프라이버시 보호를 위해 default.yml에서 proxyRemoteFiles를 true로 설정하는 것을 권장합니다."
+youCanCleanRemoteFilesCache: "파일 관리 화면의 🗑️ 버튼을 눌러 모든 캐시를 삭제할 수 있습니다."
 cacheRemoteSensitiveFiles: "리모트의 민감한 파일을 캐시"
 cacheRemoteSensitiveFilesDescription: "이 설정을 비활성화하면 리모트의 민감한 파일은 캐시하지 않고 리모트에서 직접 가져오도록 합니다."
 flagAsBot: "나는 봇입니다"
@@ -329,7 +331,7 @@ watch: "지켜보기"
 unwatch: "지켜보기 해제"
 accept: "허가"
 reject: "거부"
-normal: "정상"
+normal: "일반"
 instanceName: "서버 이름"
 instanceDescription: "서버 소개"
 maintainerName: "관리자 이름"
@@ -354,7 +356,6 @@ invite: "초대"
 driveCapacityPerLocalAccount: "로컬 유저 한 명당 드라이브 용량"
 driveCapacityPerRemoteAccount: "리모트 유저 한 명당 드라이브 용량"
 inMb: "메가바이트 단위"
-iconUrl: "아이콘 URL"
 bannerUrl: "배너 이미지 URL"
 backgroundImageUrl: "배경 이미지 URL"
 basicInfo: "기본 정보"
@@ -410,6 +411,7 @@ aboutMisskey: "Misskey에 대하여"
 administrator: "관리자"
 token: "토큰"
 2fa: "2단계 인증"
+setupOf2fa: "2단계 인증 설정"
 totp: "인증 앱"
 totpDescription: "인증 앱을 사용하여 일회성 비밀번호 입력"
 moderator: "모더레이터"
@@ -653,6 +655,7 @@ behavior: "동작"
 sample: "예시"
 abuseReports: "신고"
 reportAbuse: "신고"
+reportAbuseRenote: "Renote를 신고"
 reportAbuseOf: "{name}을 신고하기"
 fillAbuseReportDescription: "신고하려는 이유를 자세히 알려주세요. 특정 게시물을 신고할 때에는 게시물의 URL도 포함해 주세요."
 abuseReported: "신고를 보냈습니다. 신고해 주셔서 감사합니다."
@@ -680,6 +683,7 @@ createNewClip: "새 클립 만들기"
 unclip: "클립 해제"
 confirmToUnclipAlreadyClippedNote: "이 노트는 이미 \"{name}\" 클립에 포함되어 있습니다. 클립을 해제하시겠습니까?"
 public: "공개"
+private: "비공개"
 i18nInfo: "Misskey는 자원봉사자들에 의해 다양한 언어로 번역되고 있습니다. {link}에서 번역에 참가할 수 있습니다."
 manageAccessTokens: "액세스 토큰 관리"
 accountInfo: "계정 정보"
@@ -876,7 +880,7 @@ numberOfColumn: "한 줄에 보일 리액션의 수"
 searchByGoogle: "검색"
 instanceDefaultLightTheme: "서버 기본 라이트 테마"
 instanceDefaultDarkTheme: "서버 기본 다크 테마"
-instanceDefaultThemeDescription: "객체 형식의 테마 코드를 입력해 주세요."
+instanceDefaultThemeDescription: "객체 형식({}로 감싼 형태)의 테마 코드를 입력해 주세요."
 mutePeriod: "뮤트할 기간"
 period: "기간"
 indefinitely: "무기한"
@@ -1018,7 +1022,7 @@ retryAllQueuesConfirmText: "일시적으로 서버의 부하가 증가할 수
 enableChartsForRemoteUser: "리모트 유저의 차트를 생성"
 enableChartsForFederatedInstances: "리모트 서버의 차트를 생성"
 showClipButtonInNoteFooter: "노트 동작에 클립을 추가"
-largeNoteReactions: "노트의 리액션을 크게 표시"
+reactionsDisplaySize: "리액션 표시 크기"
 noteIdOrUrl: "노트 ID 및 URL"
 video: "동영상"
 videos: "동영상"
@@ -1091,6 +1095,27 @@ usedAt: "사용 시각"
 unused: "사용되지 않음"
 used: "사용됨"
 expired: "만료됨"
+doYouAgree: "동의하십니까?"
+beSureToReadThisAsItIsImportant: "중요하므로 반드시 읽어주십시오."
+iHaveReadXCarefullyAndAgree: "\"{x}\"의 내용을 읽고 동의합니다."
+dialog: "다이얼로그"
+icon: "아바타"
+forYou: "당신에게"
+currentAnnouncements: "현재 공지사항"
+pastAnnouncements: "과거 공지사항"
+youHaveUnreadAnnouncements: "읽지 않은 공지사항이 있습니다."
+useSecurityKey: "브라우저 또는 기기의 안내에 따라 보안 키 또는 패스키를 사용해 주십시오."
+replies: "답글"
+renotes: "리노트"
+_announcement:
+  forExistingUsers: "기존 유저에게만 알림"
+  forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다."
+  needConfirmationToRead: "읽음으로 표시하기 전에 확인하기"
+  needConfirmationToReadDescription: "활성화하면 이 공지사항을 읽음으로 표시하기 전에 확인 알림창을 띄웁니다. '모두 읽음'의 대상에서도 제외됩니다."
+  end: "공지에서 내리기"
+  tooManyActiveAnnouncementDescription: "공지사항이 너무 많을 경우, 사용자 경험에 영향을 끼칠 가능성이 있습니다. 오래된 공지사항은 아카이브하시는 것을 권장드립니다."
+  readConfirmTitle: "읽음으로 표시합니까?"
+  readConfirmText: "\"{title}\"을(를) 읽음으로 표시합니다."
 _initialAccountSetting:
   accountCreated: "계정 생성이 완료되었습니다!"
   letsStartAccountSetup: "계정의 초기 설정을 진행합니다."
@@ -1108,6 +1133,8 @@ _initialAccountSetting:
   laterAreYouSure: "초기 설정을 나중에 진행하시겠습니까?"
 _serverRules:
   description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다."
+_serverSettings:
+  iconUrl: "아이콘 URL"
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1676,14 +1703,14 @@ _2fa:
   step1: "먼저, {a}나 {b}등의 인증 앱을 사용 중인 디바이스에 설치합니다."
   step2: "그 후, 표시되어 있는 QR코드를 앱으로 스캔합니다."
   step2Click: "QR 코드를 클릭하면 기기에 설치된 인증 앱에 등록할 수 있습니다."
-  step2Url: "데스크톱 앱에서는 다음 URL을 입력하세요:"
+  step2Uri: "데스크톱 앱을 사용하려면 다음 URI를 입력하십시오"
   step3Title: "인증 코드 입력"
   step3: "앱에 표시된 토큰을 입력하시면 완료됩니다."
+  setupCompleted: "설정 완료했습니다"
   step4: "다음 로그인부터는 토큰을 입력해야 합니다."
   securityKeyNotSupported: "이 브라우저는 보안 키를 지원하지 않습니다."
   registerTOTPBeforeKey: "보안 키 또는 패스키를 등록하려면 인증 앱을 등록하십시오."
   securityKeyInfo: "FIDO2를 지원하는 하드웨어 보안 키 혹은 디바이스의 지문인식이나 화면잠금 PIN을 이용해서 로그인하도록 설정할 수 있습니다."
-  chromePasskeyNotSupported: "현재 Chrome의 패스키는 지원되지 않습니다."
   registerSecurityKey: "보안 키 또는 패스키 등록"
   securityKeyName: "키 이름 입력"
   tapSecurityKey: "브라우저의 지시에 따라 보안 키 또는 패스키를 등록하여 주십시오"
@@ -1694,6 +1721,11 @@ _2fa:
   renewTOTPConfirm: "기존에 등록되어 있던 인증 키는 사용하지 못하게 됩니다."
   renewTOTPOk: "재설정"
   renewTOTPCancel: "취소"
+  checkBackupCodesBeforeCloseThisWizard: "이 위자드를 닫기 전에 아래 백업 코드를 확인하십시오"
+  backupCodes: "백업 코드"
+  backupCodesDescription: "인증 앱을 사용할 수 없게 된 경우 아래 백업 코드를 사용하여 계정에 액세스 할 수 있습니다.이 코드들은 반드시 안전한 장소에 보관하십시오.각 코드는 한 번만 사용할 수 있습니다."
+  backupCodeUsedWarning: "백업 코드가 사용되었습니다.인증 앱을 사용할 수 없게 된 경우, 조속히 인증 앱을 다시 설정해 주십시오."
+  backupCodesExhaustedWarning: "백업 코드가 모두 사용되었습니다.인증 앱을 사용할 수 없는 경우 더 이상 계정에 액세스하는 것이 불가능합니다.인증 앱을 다시 등록해 주세요."
 _permissions:
   "read:account": "계정의 정보를 봅니다"
   "write:account": "계정의 정보를 변경합니다"
@@ -1727,6 +1759,10 @@ _permissions:
   "write:gallery": "갤러리를 추가하거나 삭제합니다"
   "read:gallery-likes": "갤러리의 좋아요를 확인합니다"
   "write:gallery-likes": "갤러리에 좋아요를 추가하거나 취소합니다"
+  "read:flash": "Play를 봅니다"
+  "write:flash": "Play를 조작합니다"
+  "read:flash-likes": "Play의 좋아요를 봅니다"
+  "write:flash-likes": "Play의 좋아요를 조작합니다"
 _auth:
   shareAccessTitle: "어플리케이션의 접근 허가"
   shareAccess: "\"{name}\" 이 계정에 접근하는 것을 허용하시겠습니까?"
@@ -1962,6 +1998,10 @@ _notification:
   unreadAntennaNote: "안테나 {name}"
   emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
   achievementEarned: "도전 과제를 달성했습니다"
+  testNotification: "알림 테스트"
+  checkNotificationBehavior: "알림 표시를 체크하기"
+  sendTestNotification: "테스트 알림 보내기"
+  notificationWillBeDisplayedLikeThis: "알림이 이렇게 표시됩니다"
   _types:
     all: "전부"
     follow: "팔로잉"
@@ -1997,6 +2037,8 @@ _deck:
   introduction2: "나중에라도 화면 우측의 + 버튼을 눌러 새 칼럼을 추가할 수 있습니다."
   widgetsIntroduction: "칼럼 메뉴의 \"위젯 편집\"에서 위젯을 추가해 주세요"
   useSimpleUiForNonRootPages: "루트 이외의 페이지로 접속한 경우 UI 간략화하기"
+  usedAsMinWidthWhenFlexible: "'폭 자동 조정'이 활성화된 경우 최소 폭으로 사용됩니다"
+  flexible: "폭 자동 조정"
   _columns:
     main: "메인"
     widgets: "위젯"

locales/lo-LA.yml

@@ -107,7 +107,11 @@ enterEmoji: "ປ້ອນອີໂມຈິ"
 renote: "Renote"
 unrenote: "ເລີກ Renote"
 renoted: "ເກັບບັນທຶກໄວ້"
+cantRenote: "ໂພສນີ້ບໍ່ສາມາດຖືກບັນທຶກໄວ້ຄືນໃໝ່ໄດ້"
+cantReRenote: "ບໍ່ສາມາດບັນທຶກຄືນໃໝ່ໄດ້"
 quote: "ລວມຂໍ້ຄວາມອ້າງອີງ"
+inChannelRenote: "ຊ່ອງພຽງແຕ່ Renote"
+inChannelQuote: "ຊ່ອງເທົ່ານັ້ນ Quote"
 pinnedNote: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
 pinned: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
 you: "ເຈົ້າ"
@@ -226,9 +230,12 @@ fromUrl: "ຈາກ URL"
 uploadFromUrl: "ອັບໂຫຼດຈາກ URL"
 uploadFromUrlDescription: "URL ຂອງໄຟລ໌ທີ່ທ່ານຕ້ອງການອັບໂຫລດ"
 uploadFromUrlRequested: "ຮ້ອງຂໍການອັບໂຫລດ"
+explore: "ສຳຫຼວດ"
 messageRead: "ອ່ານແລ້ວ"
 startMessaging: "ເລີ່ມການສົນທະນາໃໝ່"
 nUsersRead: "ອ່ານໂດຍ {n}"
+agree: "ຍອມຮັບ"
+termsOfService: "ເງື່ອນໄຂການບໍລິການ"
 start: "ເລີ່ມຕົ້ນນຳໃຊ້ເລີຍ"
 home: "ໜ້າຫຼັກ"
 activity: "ກິດຈະກຳ"
@@ -266,6 +273,7 @@ inputNewDescription: "ໃສ່ຄຳບັນຍາຍໃໝ່"
 inputNewFolderName: "ໃສ່ຊື່ໂຟນເດີໃໝ່"
 circularReferenceFolder: "ໂຟນເດີປາຍທາງແມ່ນໂຟນເດີຍ່ອຍຂອງໂຟນເດີທີ່ທ່ານຕ້ອງການຍ້າຍ"
 rename: "ປ່ຽນຊື່"
+doNothing: "ບໍ່ສົນໃຈ"
 watch: "ເບິ່ງ"
 unwatch: "ຢຸດເບິ່ງ"
 accept: "ອະນຸຍາດ"
@@ -294,7 +302,14 @@ enableRegistration: "ເປີດໃຊ້ການລົງທະບຽນຜ
 invite: "ເຊີນ"
 driveCapacityPerLocalAccount: "ຄວາມອາດສາມາດຂັບຕໍ່ຜູ້ໃຊ້ທ້ອງຖິ່ນ"
 driveCapacityPerRemoteAccount: "ໄດຣຟ໌ຄວາມອາດສາມາດຕໍ່ຜູ້ໃຊ້ທາງໄກ"
+basicInfo: "ຂໍ້ມຸນເບື້ອງຕົ້ນ"
 pinnedNotes: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
+hcaptchaSiteKey: "ກະແຈໄຊທ໌"
+hcaptchaSecretKey: "ກະແຈລັບ"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "ເປີດໃຊ້ງານລີແຄ໋ບຈາ"
+recaptchaSiteKey: "ກະແຈໄຊທ໌"
+recaptchaSecretKey: "ກະແຈລັບ"
 turnstileSiteKey: "ກະແຈໄຊທ໌"
 turnstileSecretKey: "ກະແຈລັບ"
 name: "ຊື່"
@@ -302,24 +317,41 @@ userList: "ລາຍການ"
 about: "ກ່ຽວກັບ"
 aboutMisskey: "ກ່ຽວກັບ Misskey"
 administrator: "ຜູ້ບໍລິຫານ"
+token: "ໂທເຄັນ"
 share: "ແບ່ງປັນ"
 notFound: "ບໍ່ພົບ"
 cacheClear: "ລຶບລ້າງແຄສ"
+help: "ຊ່ວຍເຫຼືອ"
+close: "ປິດ"
 invites: "ເຊີນ"
+members: "ສະມາຊິກ"
+transfer: "ໂອນຍ້າຍ"
 title: "ຫົວຂໍ້"
 text: "ຂໍ້ຄວາມ"
 enable: "ເປີດໃຊ້"
 next: "ຕໍ່ໄປ"
+retype: "ເຂົ້າໄປອີກຄັ້ງ"
+quoteAttached: "ວົງຢືມ"
 invitations: "ເຊີນ"
+unavailable: "ບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້"
 language: "ພາສາ"
+aboutX: "ກ່ຽວກັບ {x}"
+emojiStyle: "ຮູບແບບອີໂມຈິ"
 native: "ພາ​ສາ​ແມ່"
+noHistory: "​ບໍ່​ມີ​ລາຍ​ການ​ຢູ່​ບ່ອນ​ນີ້"
+doing: "ກຳລັງປະມວນຜົນ..."
 category: "ຫມວດຫມູ່"
 tags: "ແທ໋ກ"
 createAccount: "ສ້າງບັນຊີ"
 existingAccount: "ທີ່ມີຢູ່"
 dashboard: "ໜ້າປັດ"
 local: "ທ້ອງຖິ່ນ"
+numberOfDays: "ຈຳນວນມື້"
+objectStorageBucket: "Bucket"
+objectStoragePrefix: "Prefix"
+objectStorageEndpoint: "Endpoint"
 objectStorageRegion: "ພາກ​ພື້ນ"
+deleteAll: "ລຶບທັງໝົດ"
 sounds: "ສຽງ"
 sound: "ສຽງ"
 none: "ບໍ່ມີ"
@@ -333,18 +365,42 @@ ascendingOrder: "ນ້ອຍໄປຫາໃຫຍ່"
 descendingOrder: "ໃຫຍ່ຫານ້ອຍ"
 output: "ຜົນຜະລິດ"
 script: "ບົດ​ຄວາມ"
+menu: "ເມນູ"
+rearrange: "ຈັດລຽງຄືນ"
+poll: "ການພູນ"
+description: "ລາຍລະອຽດ"
+author: "ຜູ້ຂຽນ"
+manage: "ການຈັດການ"
+plugins: "ປລັ໋ກອີນ"
+width: "ກວ້າງ"
+height: "ຄວາມສູງ"
+large: "ໃຫຍ່."
+medium: "ປານກາງ"
+small: "ເລັກ"
+permission: "ການອະນຸຍາດ"
+notificationType: "​ປະເພດການ​ແຈ້ງ​ເຕືອນ"
+edit: "ແກ້ໄຂ"
+email: "ອີເມວ"
 smtpHost: "ໂຮດສ"
 smtpUser: "ຊື່ຜູ້ໃຊ້"
 smtpPass: "ລະຫັດຜ່ານ"
 clearCache: "ລຶບລ້າງແຄສ"
 info: "ກ່ຽວກັບ"
 user: "ຜູ້ໃຊ້ຕ່າງໆ"
+administration: "ການຈັດການ"
+middle: "ປານກາງ"
 searchByGoogle: "ຄົ້ນຫາ"
 file: "ໄຟລ໌"
+replies: "ຕອບ​ໄປ​ທີ"
+renotes: "Renote"
+_role:
+  _priority:
+    middle: "ປານກາງ"
 _email:
   _follow:
     title: "ໄດ້ຕິດຕາມທ່ານ"
 _theme:
+  description: "ລາຍລະອຽດ"
   keys:
     mention: "ໄດ້ກ່າວມາ"
     renote: "Renote"
@@ -383,6 +439,7 @@ _timelines:
   home: "ໜ້າຫຼັກ"
 _play:
   script: "ບົດ​ຄວາມ"
+  summary: "ລາຍລະອຽດ"
 _pages:
   blocks:
     image: "ຮູບພາບ"

locales/nl-NL.yml

@@ -338,7 +338,6 @@ invite: "Uitnodigen"
 driveCapacityPerLocalAccount: "Opslagruimte per lokale gebruiker"
 driveCapacityPerRemoteAccount: "Opslagruimte per externe gebruiker"
 inMb: "in megabytes"
-iconUrl: "Pictogram URL"
 bannerUrl: "Banner URL"
 backgroundImageUrl: "URL afbeelding"
 basicInfo: "Basisinformatie"
@@ -426,6 +425,9 @@ pushNotificationAlreadySubscribed: "Pushberichtrn al ingeschakeld"
 windowMaximize: "Maximaliseren"
 windowRestore: "Herstellen"
 loggedInAsBot: "Momenteel als bot ingelogd"
+icon: "Avatar"
+replies: "Antwoord"
+renotes: "Herdelen"
 _email:
   _follow:
     title: "volgde jou"

locales/no-NO.yml

@@ -461,6 +461,9 @@ videos: "Videoer"
 continue: "Fortsett"
 youFollowing: "Følger"
 options: "Alternativ"
+icon: "Avatar"
+replies: "Svar"
+renotes: "Renote"
 _initialAccountSetting:
   theseSettingsCanEditLater: "Du kan endre disse innstillingene senere."
 _achievements:

locales/pl-PL.yml

@@ -333,7 +333,6 @@ invite: "Zaproś"
 driveCapacityPerLocalAccount: "Powierzchnia dyskowa na lokalnego użytkownika"
 driveCapacityPerRemoteAccount: "Powierzchnia dyskowa na zdalnego użytkownika"
 inMb: "W megabajtach"
-iconUrl: "Adres URL ikony"
 bannerUrl: "Adres URL banera"
 backgroundImageUrl: "Adres URL tła"
 basicInfo: "Podstawowe informacje"
@@ -644,6 +643,7 @@ createNewClip: "Utwórz nowy klip"
 unclip: "Odczep"
 confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
+private: "Prywatne"
 i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
 accountInfo: "Informacje o koncie"
@@ -870,6 +870,9 @@ like: "Polub"
 show: "Wyświetlanie"
 color: "Kolor"
 youFollowing: "Śledzeni"
+icon: "Awatar"
+replies: "Odpowiedz"
+renotes: "Udostępnij"
 _role:
   priority: "Priorytet"
   _priority:
@@ -1089,6 +1092,8 @@ _2fa:
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
   step4: "Od teraz, przy każdej próbie logowania otrzymasz prośbę o token logowania."
   removeKeyConfirm: "Usunąć kopię zapasową {name}?"
+  renewTOTPConfirm: "Spowoduje to, że kody weryfikacyjne z poprzedniej aplikacji przestaną działać"
+  renewTOTPOk: "Rekonfiguruj"
   renewTOTPCancel: "Nie teraz"
 _permissions:
   "read:account": "Wyświetl informacje o swoim koncie"
@@ -1102,8 +1107,10 @@ _permissions:
   "read:following": "Wyświetlanie informacji o obserwowanych"
   "write:following": "Obserwowanie lub cofanie obserwacji innych kont"
   "read:messaging": "Zobacz swoje czaty"
+  "write:messaging": "Tworzenie lub usuwanie wiadomości czatu"
   "read:mutes": "Wyświetlanie listy osób, które wyciszyłeś(-aś)"
   "write:mutes": "Edycja listy osób, które wyciszyłeś(-aś)"
+  "write:notes": "Tworzenie lub usuwanie wpisów"
   "read:notifications": "Wyświetlanie powiadomień"
   "write:notifications": "Działanie na powiadomieniach"
   "read:reactions": "Wyświetlanie reakcji"
@@ -1119,9 +1126,23 @@ _permissions:
   "write:channels": "Edytuj swoje kanały"
   "read:gallery": "Zobacz swoją galerię"
   "write:gallery": "Edytuj swoją galerię"
+  "read:gallery-likes": "Wyświetlanie listy polubionych postów w galerii"
+  "write:gallery-likes": "Edytowanie listy polubionych postów w galerii"
 _auth:
+  shareAccessTitle: "Przyznawanie uprawnień aplikacji"
   shareAccess: "Czy chcesz autoryzować „{name}” do dostępu do tego konta?"
+  shareAccessAsk: "Czy na pewno chcesz zezwolić tej aplikacji na dostęp do Twojego konta?"
+  permission: "{name} żąda następujących uprawnień"
   permissionAsk: "Ta aplikacja wymaga następujących uprawnień:"
+  pleaseGoBack: "Proszę, wróć do aplikacji"
+  callback: "Powracanie do aplikacji"
+  denied: "Odmowa dostępu"
+  pleaseLogin: "Zaloguj się, aby autoryzować aplikacje."
+_antennaSources:
+  all: "Wszystkie wpisy"
+  homeTimeline: "Wpisy obserwowanych użytkowników"
+  users: "Wpisy określonych użytkowników"
+  userList: "Wpisy z określonej listy użytkowników"
 _weekday:
   sunday: "Niedziela"
   monday: "Poniedziałek"
@@ -1154,8 +1175,10 @@ _widgets:
   serverMetric: "Metryka serwera"
   aiscript: "Konsola AiScript"
   aichan: "Ai"
+  userList: "Lista użytkowników"
   _userList:
     chooseList: "Wybierz listę"
+  clicker: "Clicker"
 _cw:
   hide: "Ukryj"
   show: "Załaduj więcej"
@@ -1187,10 +1210,16 @@ _visibility:
   public: "Publiczny"
   publicDescription: "Twój wpis pojawi się w publicznych osiach czasu"
   home: "Strona główna"
+  homeDescription: "Publikuj tylko na głównej osi czasu"
   followers: "Obserwujący"
+  followersDescription: "Widoczne tylko dla obserwujących"
   specified: "Bezpośredni"
   specifiedDescription: "Napisz tylko określonym użytkownikom"
+  disableFederationDescription: "Nie przesyłaj do innych instancji"
 _postForm:
+  replyPlaceholder: "Odpowiedz na ten wpis..."
+  quotePlaceholder: "Zacytuj ten wpis…"
+  channelPlaceholder: "Publikuj na kanale..."
   _placeholders:
     a: "Co się dzieje?"
     b: "Co się wydarzyło?"
@@ -1212,17 +1241,29 @@ _profile:
   changeBanner: "Zmień baner"
 _exportOrImport:
   allNotes: "Wszystkie wpisy"
+  favoritedNotes: "Ulubione wpisy"
   followingList: "Obserwowani"
   muteList: "Wycisz"
   blockingList: "Zablokuj"
   userLists: "Listy"
+  excludeMutingUsers: "Wyklucz wyciszonych użytkowników"
+  excludeInactiveUsers: "Wyklucz nieaktywnych użytkowników"
 _charts:
   federation: "Federacja"
   apRequest: "Żądania"
+  usersIncDec: "Różnica w liczbie użytkowników"
   usersTotal: "Łącznie # użytkowników"
   activeUsers: "Aktywni użytkownicy"
+  notesIncDec: "Różnica w liczbie wpisów"
+  notesTotal: "Całkowita liczba wpisów"
+  filesIncDec: "Różnica w liczbie plików"
+  filesTotal: "Całkowita liczba plików"
+  storageUsageIncDec: "Różnica w wykorzystaniu pamięci"
+  storageUsageTotal: "Całkowite wykorzystanie pamięci"
 _instanceCharts:
   requests: "Żądania"
+  users: "Różnica w liczbie użytkowników"
+  notes: "Różnica w liczbie wpisów"
   notesTotal: "Łącznie # wpisów"
   ff: "Różnica w # obserwujących"
   ffTotal: "Łączna liczba # obserwujących"
@@ -1347,5 +1388,16 @@ _deck:
     mentions: "Wspomnienia"
     direct: "Bezpośredni"
 _webhookSettings:
+  createWebhook: "Stwórz Webhook"
   name: "Nazwa"
+  secret: "Sekret"
+  events: "Uruchomienie Webhooka"
   active: "Właczono"
+  _events:
+    follow: "Po zaobserwowaniu użytkownika"
+    followed: "Po zostaniu zaobserwowanym"
+    note: "Po opublikowaniu wpisu"
+    reply: "Po otrzymaniu odpowiedzi"
+    renote: "Po udostępnieniu wpisu"
+    reaction: "Po otrzymaniu reakcji"
+    mention: "Po zostaniu wspomnianym"

locales/pt-PT.yml

@@ -4,7 +4,7 @@ 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} é um dos servidores da plataforma de código aberto <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
-search: "Buscar"
+search: "Pesquisar"
 notifications: "Notificações"
 username: "Nome de usuário"
 password: "Senha"
@@ -25,36 +25,37 @@ basicSettings: "Configurações básicas"
 otherSettings: "Outras configurações"
 openInWindow: "Abrir em um janela"
 profile: "Perfil"
-timeline: "Timeline"
+timeline: "Linha do tempo"
 noAccountDescription: "Este usuário não tem uma descrição."
 login: "Iniciar sessão"
 loggingIn: "Iniciando sessão…"
 logout: "Sair"
 signup: "Registrar-se"
 uploading: "Enviando…"
-save: "Guardar"
+save: "Salvar"
 users: "Usuários"
 addUser: "Adicionar usuário"
 favorite: "Adicionar aos favoritos"
-favorites: "Adicionar aos favoritos"
+favorites: "Favoritos"
 unfavorite: "Remover dos favoritos"
 favorited: "Adicionado aos favoritos."
 alreadyFavorited: "Já adicionado aos favoritos."
 cantFavorite: "Não foi possível adicionar aos favoritos."
-pin: "Afixar no perfil"
+pin: "Fixar no perfil"
 unpin: "Desafixar do perfil"
 copyContent: "Copiar conteúdos"
 copyLink: "Copiar link"
+copyLinkRenote: "Copiar o link da repostagem"
 delete: "Excluir"
 deleteAndEdit: "Excluir e editar"
 deleteAndEditConfirm: "Deseja excluir esta nota e editá-la novamente? Todas as reações, compartilhamentos e respostas a esta nota também serão excluídas."
 addToList: "Adicionar a lista"
 addToAntenna: "Adicionar à antena"
-sendMessage: "Enviar uma mensagem"
+sendMessage: "Enviar mensagem"
 copyRSS: "Copiar RSS"
 copyUsername: "Copiar nome de utilizador"
-copyUserId: "Copiar o ID do utilizador"
+copyUserId: "Copiar ID do utilizador"
-copyNoteId: "Copiar o ID da publicação"
+copyNoteId: "Copiar ID da publicação"
 copyFileId: "Copiar o ID do arquivo"
 copyFolderId: "Copiar o ID da pasta"
 copyProfileUrl: "Copiar a URL do perfil"
@@ -89,7 +90,7 @@ createList: "Criar lista"
 manageLists: "Gerenciar listas"
 error: "Erro"
 somethingHappened: "Ocorreu um erro"
-retry: "Tentar novamente"
+retry: "Tente novamente"
 pageLoadError: "Ocorreu um erro ao carregar a página."
 pageLoadErrorDescription: "Isso geralmente acontece devido ao cache do navegador ou da rede. Tente limpar o cache ou aguarde um pouco antes de tentar novamente."
 serverIsDead: "Não há resposta do servidor. Aguarde um momento e tente novamente."
@@ -156,6 +157,7 @@ addEmoji: "Adicionar um Emoji"
 settingGuide: "Guia de configuração"
 cacheRemoteFiles: "Cache de arquivos remotos"
 cacheRemoteFilesDescription: "Ao desativar esta configuração, os arquivos remotos não serão mais armazenados em cache e serão vinculados diretamente. Isso economizará espaço de armazenamento no servidor, mas os thumbnails não serão gerados, o que pode aumentar o tráfego de dados."
+youCanCleanRemoteFilesCache: "Pode excluir todos os caches com o botão 🗑️ de gestão de arquivos."
 cacheRemoteSensitiveFiles: "Fazer cache de arquivos remotos sensíveis"
 cacheRemoteSensitiveFilesDescription: "Desativar essa configuração faz com que arquivos remotos sensíveis sejam vinculados diretamente em vez de armazenados em cache."
 flagAsBot: "Marcar conta como robô"
@@ -231,7 +233,7 @@ federating: "Federando"
 blocked: "Bloqueado"
 suspended: "Suspenso"
 all: "Todos"
-subscribing: "Subscrito"
+subscribing: "Inscrito"
 publishing: "Publicando"
 notResponding: "Sem resposta"
 instanceFollowing: "Seguir a instância"
@@ -278,15 +280,15 @@ agreeBelow: "Eu concordo com o seguinte"
 basicNotesBeforeCreateAccount: "Observações importantes"
 termsOfService: "Termos de Uso"
 start: "começar"
-home: "casa"
+home: "Início"
 remoteUserCaution: "As informações estão incompletas porque é um utilizador remoto."
 activity: "atividade"
 images: "imagem"
 image: "imagem"
-birthday: "aniversário"
+birthday: "Aniversário"
 yearsOld: "{age} anos"
 registeredDate: "Data de registro"
-location: "Lugar, colocar"
+location: "Localização"
 theme: "tema"
 themeForLightMode: "Temas usados ​​no modo de luz"
 themeForDarkMode: "Temas usados ​​no modo escuro"
@@ -295,7 +297,7 @@ dark: "Escuro"
 lightThemes: "Tema claro"
 darkThemes: "Tema escuro"
 syncDeviceDarkMode: "Sincronize com o modo escuro do dispositivo"
-drive: "Unidades"
+drive: "Drive"
 fileName: "Nome do Ficheiro"
 selectFile: "Selecione os arquivos"
 selectFiles: "Selecione os arquivos"
@@ -354,7 +356,6 @@ invite: "Convidar"
 driveCapacityPerLocalAccount: "Capacidade do drive por usuário local"
 driveCapacityPerRemoteAccount: "Capacidade do drive por usuário remoto"
 inMb: "Em ‘megabytes’"
-iconUrl: "URL da imagem do ícone (favicon, etc.)"
 bannerUrl: "URL da imagem do ‘banner’"
 backgroundImageUrl: "URL da imagem de fundo"
 basicInfo: "Informações básicas"
@@ -428,7 +429,7 @@ reduceUiAnimation: "Reduzir a animação da ‘interface’ do utilizador"
 share: "Compartilhar"
 notFound: "Não encontrado"
 notFoundDescription: "Não havia página correspondente ao URL especificado."
-uploadFolder: "Destino de ‘upload’ padrão"
+uploadFolder: "Destino de upload padrão"
 cacheClear: "Excluir memória transitória"
 markAsReadAllNotifications: "Marcar todas as notificações como lidas"
 markAsReadAllUnreadNotes: "Marcar todas as postagens como lidas"
@@ -489,7 +490,7 @@ fontSize: "Tamanho do texto"
 mediaListWithOneImageAppearance: "Altura da lista de mídias com apenas uma imagem"
 limitTo: "Até {x}"
 noFollowRequests: "Não há pedidos de seguidor pendentes"
-openImageInNewTab: "Abrir a imagem numa nova aba"
+openImageInNewTab: "Abrir a imagem em uma nova aba"
 dashboard: "Painel de controle"
 local: "Local"
 remote: "Remoto"
@@ -601,7 +602,7 @@ useFullReactionPicker: "Usar o seletor de reações completo"
 width: "Largura"
 height: "Altura"
 large: "Grande"
-medium: "Média"
+medium: "Médio"
 small: "Pequeno"
 generateAccessToken: "Gerar token de acesso"
 permission: "Permissões"
@@ -653,6 +654,7 @@ behavior: "Comportamento"
 sample: "Exemplo"
 abuseReports: "Denúncias"
 reportAbuse: "Denúncias"
+reportAbuseRenote: "Reportar repostagem"
 reportAbuseOf: "Denunciar {name}"
 fillAbuseReportDescription: "Por favor, forneça detalhes sobre o motivo da denúncia. Se houver uma nota específica envolvida, inclua também a URL dela."
 abuseReported: "Denúncia enviada. Obrigado por sua ajuda."
@@ -680,6 +682,7 @@ createNewClip: "Criar novo clipe"
 unclip: "Remover do clipe"
 confirmToUnclipAlreadyClippedNote: "Esta nota já está incluída no clipe \"{name}\". Você deseja remover a nota deste clipe?"
 public: "Público"
+private: "Privado"
 i18nInfo: "Misskey é traduzido para várias línguas por voluntários. Você pode ajudar com as traduções em {link}."
 manageAccessTokens: "Gerenciar tokens de acesso"
 accountInfo: "Informações da conta"
@@ -715,63 +718,263 @@ useSystemFont: "Utilizar a fonte padrão do sistema"
 clips: "Clipe"
 experimentalFeatures: "Funcionalidades Experimentais"
 experimental: "Experimental"
+thisIsExperimentalFeature: "Este é um recurso experimental. As funções podem mudar ou pode não funcionar corretamente."
+developer: "Programador"
+makeExplorable: "Deixe a sua conta mais fácil de encontrar."
+makeExplorableDescription: "Se você desativá-lo, outros usuários não poderão encontrar a sua conta na aba Descoberta."
+showGapBetweenNotesInTimeline: "Mostrar um espaço entre as notas na linha de tempo"
 duplicate: "Duplicar"
 left: "Esquerda"
+center: "Centralizar"
 wide: "Largo"
 narrow: "Estreito"
+reloadToApplySetting: "As configurações serão refletidas após recarregar a página. Deseja recarregar agora?"
+needReloadToApply: "É necessário recarregar a página para refletir as alterações."
 showTitlebar: "Exibir barra de título"
 clearCache: "Limpar o cache"
+onlineUsersCount: "Pessoas Online"
+nUsers: "Usuários"
+nNotes: "Notas"
+sendErrorReports: "Enviar relatórios de erro"
 sendErrorReportsDescription: "Ao ativar essa opção, informações detalhadas de erro serão compartilhadas com o Misskey em caso de problemas, o que pode ajudar a melhorar a qualidade do software. As informações de erro podem incluir a versão do sistema operacional, o tipo de navegador e o sua atividade no Misskey."
+myTheme: "Meu tema"
 backgroundColor: "Cor de fundo"
+accentColor: "Cor de destaque"
+textColor: "Cor do texto"
+saveAs: "Salvar como"
 advanced: "Avançado"
+advancedSettings: "Configurações avançadas"
 value: "Valor"
+createdAt: "Data de criação"
+updatedAt: "Última atualização"
+saveConfirm: "Deseja salvá-lo?"
 deleteConfirm: "Confirma a exclusão?"
+invalidValue: "Valor inválido"
+registry: "Registo"
+closeAccount: "Encerrar conta"
+currentVersion: "Versão Atual"
+latestVersion: "Última versão"
+youAreRunningUpToDateClient: "Você está usando a última versão do cliente"
+newVersionOfClientAvailable: "Nova versão do cliente disponível"
+usageAmount: "Quantidade utilizada"
 capacity: "Capacidade"
+inUse: "Em uso"
+editCode: "Editar código"
 apply: "Aplicar"
+receiveAnnouncementFromInstance: "Receba as notificações da instância"
 emailNotification: "Notificações por e-mail"
 publish: "Publicar"
+inChannelSearch: "Pesquisar no canal"
+useReactionPickerForContextMenu: "Clique com o botão direito do mouse para abrir o seletor de reações."
+typingUsers: "digitando"
+jumpToSpecifiedDate: "Pular para uma data específica"
+showingPastTimeline: "Visualizar linha de tempo anterior"
+clear: "Limpar"
+markAllAsRead: "Marcar todas como lidas"
 goBack: "Voltar"
 unlikeConfirm: "Deseja realmente deixar de curtir?"
+fullView: "Visão completa"
+quitFullView: "Sair da visualização completa"
+addDescription: "Adicionar descrição"
+userPagePinTip: "Notas podem ser mostradas aqui ao clicar em \"Fixar no Perfil\" no menu de notas individuais."
+notSpecifiedMentionWarning: "Esta nota menciona usuários que não foram incluídos como recipientes."
 info: "Informações"
+userInfo: "Informações do Usuário"
 unknown: "Desconhecido"
+onlineStatus: "On-line"
+hideOnlineStatus: "Ocultar o status on-line."
+hideOnlineStatusDescription: "Esconder que está Ativo reduzirá a utilidade de certas funções (como, por exemplo, a Pesquisa)."
+online: "Online"
+active: "Ativo"
+offline: "Inativo"
+notRecommended: "Não recomendado"
+botProtection: "Proteção contra Bot"
+instanceBlocking: "Instâncias bloqueadas"
+selectAccount: "Selecionar conta"
+switchAccount: "Trocar conta"
 enabled: "Ativado"
 disabled: "Desativado"
+quickAction: "Ações rápidas"
 user: "Usuários"
 administration: "Administrar"
+accounts: "Contas"
+switch: "Trocar"
+noMaintainerInformationWarning: "A informação de administrador não foi configurada."
+noBotProtectionWarning: "A proteção contra bots não foi configurada."
+configure: "Configurar"
+postToGallery: "Criar publicação em galeria"
+postToHashtag: "Publicar nesta Hashtag"
+gallery: "Galeria"
+recentPosts: "Notas recentes"
+popularPosts: "Notas populares"
+shareWithNote: "Compartilhar em Notas"
 ads: "Anúncios"
+expiration: "Data limite"
+startingperiod: "Data de início"
+memo: "Nota"
+priority: "Prioridade"
+high: "Alto"
 middle: "Meio"
+low: "Baixo"
 emailNotConfiguredWarning: "Endereço de e-mail não configurado. "
+ratio: "Ratio"
+previewNoteText: "Visualizar Nota"
+customCss: "CSS Personalizado"
+customCssWarn: "Esta configuração só deve ser usada se souber o que está fazendo. Valores impróprios podem causar erros no funcionamento do cliente."
+global: "Global"
+squareAvatars: "Exibir ícones quadrados"
 sent: "Enviar"
+received: "Recebido"
+searchResult: "Pesquisar"
+hashtags: "Hashtags"
+troubleshooting: "Resolução de problemas"
+useBlurEffect: "Usar efeito de desfoque na UI"
+learnMore: "Saiba mais"
+misskeyUpdated: "Misskey foi atualizado!"
+whatIsNew: "Ver atualizações"
 translate: "Traduzir"
+translatedFrom: "Traduzido de"
+accountDeletionInProgress: "Encerramento de conta em andamento"
 usernameInfo: "O nome para identificar exclusivamente a sua conta no servidor. Pode conter letras (az, AZ), números (0~9) e sublinhados (_). O nome de usuário não pode ser alterado posteriormente."
+aiChanMode: "Modo AI-chan"
+devMode: "Modo de Desenvolvedor"
+keepCw: "Manter aviso de conteúdo"
+pubSub: "Publicar/Inscrever no perfil"
+lastCommunication: "Ultima atualização"
+resolved: "Resolvido"
+unresolved: "Não resolvido"
 breakFollow: "Remover seguidor"
 breakFollowConfirm: "Deseja realmente deixar de seguir?"
+itsOn: "Ativado"
+itsOff: "Desativado"
 on: "Ligado"
 off: "Desligado"
 emailRequiredForSignup: "Tornar o endereço de e-mail obrigatório durante o cadastro"
 unread: "Não lido"
+filter: "Filtrar"
+controlPanel: "Painel de controle"
+manageAccounts: "Gerenciar contas"
+makeReactionsPublic: "Deixar o histórico de reações em Público"
+makeReactionsPublicDescription: "Isto vai deixar o histórico de todas as suas reações visíveis para qualquer um ver."
+classic: "Clássico"
+muteThread: "Silenciar esta conversa"
+unmuteThread: "Desativar silêncio desta conversa"
+ffVisibility: "Visibilidade de Seguidos/Seguidores"
+ffVisibilityDescription: "Permite configurar quem pode ver quem lhe segue e quem você está seguindo."
+continueThread: "Ver mais desta conversa"
 deleteAccountConfirm: "Deseja realmente excluir a conta?"
+incorrectPassword: "Senha inválida."
+voteConfirm: "Deseja confirmar o seu voto em \"{choice}\"?"
 hide: "Ocultar"
 useDrawerReactionPickerForMobile: "Mostrar em formato de gaveta"
+welcomeBackWithName: "Bem-vindo de volta, {name}"
 clickToFinishEmailVerification: "Clique em [{ok}] para completar a validação do endereço de e-mail."
+overridedDeviceKind: "Sobrepor dispositivo"
+smartphone: "Celular"
+tablet: "Tablet"
 auto: "Automático"
-searchByGoogle: "Buscar"
+themeColor: "Cor do tema"
+size: "Tamanho"
+numberOfColumn: "Número da coluna"
+searchByGoogle: "Pesquisar"
+instanceDefaultLightTheme: "Tema diurno padrão para toda a instância"
+instanceDefaultDarkTheme: "Tema noturno para toda a instância"
+instanceDefaultThemeDescription: "Insira o código do tema em formato de objeto."
+mutePeriod: "Duração de silenciamento"
+period: "Data limite"
+indefinitely: "Indefinitivamente"
+tenMinutes: "10 minutos"
+oneHour: "1 hora"
+oneDay: "1 dia"
+oneWeek: "1 semana"
+oneMonth: "1 mês"
+reflectMayTakeTime: "As mudanças podem demorar a aparecer."
+failedToFetchAccountInformation: "Não foi possível obter informações da conta"
+rateLimitExceeded: "Taxa limite excedido"
+cropImage: "Recortar imagem"
+cropImageAsk: "Deseja recortar esta imagem?"
+cropYes: "Recortar"
+cropNo: "Manter deste jeito"
 file: "Ficheiros"
+recentNHours: "Últimas {n} horas"
+recentNDays: "Últimos {n} dias"
 noEmailServerWarning: "Servidor de e-mail não configurado."
+thereIsUnresolvedAbuseReportWarning: "Existem denúncias não resolvidas."
+recommended: "Recomendado"
+check: "Verificar"
 driveCapOverrideLabel: "Altere a capacidade do drive para este usuário"
 driveCapOverrideCaption: "Altere a capacidade para o valor padrão informando o valor 0 ou inferior."
+requireAdminForView: "Para visualizar, é necessário acessar com uma conta de administrador."
+isSystemAccount: "É uma conta criada e gerenciada automaticamente pelo sistema."
+typeToConfirm: "Para realizar essa operação, digite {x}."
 deleteAccount: "Excluir conta"
+document: "Documentação"
+numberOfPageCache: "Número de cache de página"
+numberOfPageCacheDescription: "Aumentar isso melhora a conveniência, mas também resulta em maior carga e uso de memória."
+logoutConfirm: "Gostaria de encerrar a sessão?"
+lastActiveDate: "Última data de uso"
+statusbar: "Barra de status"
+pleaseSelect: "Por favor, selecione."
+reverse: "Inversão"
+colored: "Colorido"
+refreshInterval: "Intervalo de atualização"
+type: "Tipo"
+speed: "Velocidade"
+slow: "Lento"
+fast: "Rápido"
+sensitiveMediaDetection: "Detecção de conteúdo sensível"
+localOnly: "Apenas local"
+remoteOnly: "Apenas remoto"
+cannotUploadBecauseExceedsFileSizeLimit: "Não é possível realizar o upload deste arquivo porque ele excede o tamanho máximo permitido."
+beta: "Beta"
+enableAutoSensitive: "Marcar automaticamente como conteúdo sensível"
 enableAutoSensitiveDescription: "Quando disponível, a marcação de mídia sensível será automaticamente atribuído ao conteúdo de mídia usando aprendizado de máquina. Mesmo que você desative essa função, em alguns servidores, isso pode ser configurado automaticamente."
 activeEmailValidationDescription: "A validação do endereço de e-mail do usuário será realizada de forma mais rigorosa, considerando se é um endereço descartável ou se é possível realizar comunicação efetiva. Se desativado, apenas a validade do formato do endereço será verificada como uma sequência de caracteres."
+shuffle: "Aleatório"
+account: "Contas"
+move: "Mover"
+pushNotification: "Notificações Push"
+subscribePushNotification: "Ativar notificações push"
+unsubscribePushNotification: "Desativar notificações push"
+windowMinimize: "Minimizar"
+windowRestore: "Restaurar"
+caption: "legenda"
+tools: "Ferramentas"
 like: "Curtir"
 unlike: "Remover curtida"
 numberOfLikes: "Número de curtidas"
 show: "Visualizar"
+neverShow: "Não exibir novamente"
+remindMeLater: "Lembrar mais tarde"
 didYouLikeMisskey: "Você gostou do Misskey?"
 pleaseDonate: "O Misskey é um software gratuito utilizado por {host}. Para que possamos continuar o desenvolvimento, pedimos que considerem fazer doações. A sua contribuição é muito importante!"
 roles: "Cargos"
 role: "Cargo"
 noRole: "Nenhum cargo"
+normalUser: "Usuários padrão"
+undefined: "Indefinido"
+assign: "Atribuir"
+unassign: "Remover"
+color: "Cor"
+manageCustomEmojis: "Gerenciar Emojis customizados"
+youCannotCreateAnymore: "Você atingiu o limite de criação."
+cannotPerformTemporary: "Ação temporariamente indisponível"
+cannotPerformTemporaryDescription: "Esta ação não pôde ser concluída devido ao excesso de pedidos em sucessão. Tente novamente em alguns momentos."
+invalidParamError: "Parâmetros inválidos"
+invalidParamErrorDescription: "Parâmetros requisitados inválidos. Isto normalmente acontece devido a um erro, mas também pode ocorrer devido à entrada de valores além do limite ou algo semelhante."
+permissionDeniedError: "Operação recusada"
+permissionDeniedErrorDescription: "Esta conta não tem permissão para executar esta ação."
+preset: "Predefinições"
+selectFromPresets: "Escolher de predefinições"
+achievements: "Conquistas"
+gotInvalidResponseError: "Resposta do servidor inválida"
+gotInvalidResponseErrorDescription: "Servidor fora do ar ou em manutenção. Favor tentar mais tarde."
+thisPostMayBeAnnoying: "Esta nota pode incomodar outras pessoas."
+thisPostMayBeAnnoyingHome: "Postar na linha do tempo inicial"
+thisPostMayBeAnnoyingCancel: "Cancelar"
+thisPostMayBeAnnoyingIgnore: "Postar mesmo assim"
+collapseRenotes: "Ocultar repostagens já visualizadas"
+internalServerError: "Erro interno de servidor"
 emailNotSupported: "O envio de e-mails não é suportado nesta instância"
 likeOnly: "Apenas curtidas"
 likeOnlyForRemote: "Tudo (somente curtidas remotas)"
@@ -780,7 +983,20 @@ rolesAssignedToMe: "Cargos atribuídos a mim"
 unfavoriteConfirm: "Deseja realmente remover dos favoritos?"
 drivecleaner: "Limpeza do drive"
 retryAllQueuesConfirmTitle: "Gostaria de tentar novamente agora?"
+reactionsDisplaySize: "Tamanho de exibição das reações"
+reactionsList: "Reações"
+renotesList: "Repostagens"
+leftTop: "Superior esquerdo"
+rightTop: "Superior direito"
+leftBottom: "Inferior esquerdo"
+rightBottom: "Inferior direito"
+vertical: "Vertical"
+horizontal: "Exibir painel lateral inteiro"
+position: "Posição"
+serverRules: "Regras do servidor"
+continue: "Continuar"
 preservedUsernamesDescription: "Liste os nomes de usuário que deseja reservar, separando-os por quebras de linha. Os nomes de usuário especificados aqui não poderão ser utilizados durante a criação de contas. No entanto, esta restrição não se aplica quando a conta é criada por um administrador. Além disso, as contas que já existem não serão afetadas."
+archive: "Arquivo"
 channelArchiveConfirmTitle: "Deseja realmente arquivar {name}?"
 youFollowing: "Seguindo"
 preventAiLearningDescription: "Solicita-se que o conteúdo de notas e imagens enviadas não seja usado como objeto de aprendizado por sistemas externos de geração de texto ou imagens. Isso é alcançado incluindo a flag 'noai' na resposta HTML. No entanto, o cumprimento dessa solicitação depende do próprio sistema de IA, portanto, não é garantia total de prevenção de aprendizado."
@@ -789,8 +1005,13 @@ rolesThatCanBeUsedThisEmojiAsReaction: "Cargos que podem utilizar este emoji com
 rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Se nenhum cargo for especificado, qualquer pessoa pode usar este emoji como reação."
 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Estes cargos devem ser públicos."
 waitingForMailAuth: "Verificação de e-mail pendente "
+icon: "Avatar"
+replies: "Responder"
+renotes: "Repostar"
 _initialAccountSetting:
   followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo."
+_serverSettings:
+  iconUrl: "URL do ícone"
 _accountMigration:
   moveFromDescription: "Se você deseja migrar de outra conta para esta, é necessário criar um alias aqui. Por favor, insira a conta de origem da migração no seguinte formato: @username@server.example.com. Para excluir o alias, deixe o campo em branco e clique em salvar (não recomendado)."
   moveAccountDescription: "Você está migrando para uma nova conta.\n　・Seus seguidores irão automaticamente seguir a nova conta.\n　・Todas as suas conexões de seguidores nesta conta serão removidas.\n　・Você não poderá mais criar novas notas nesta conta.\n\nA migração dos seguidores é automática, mas a migração das pessoas que você segue deve ser feita manualmente. Antes de migrar, exporte quem você está seguindo nesta conta e, assim que migrar, importe essa lista na nova conta.\nO mesmo se aplica para listas, silenciamentos e bloqueios, que também devem ser migrados manualmente.\n\n(Esta descrição se refere ao comportamento do servidor Misskey v13.12.0 ou posterior. Outros softwares ActivityPub, como Mastodon, podem ter comportamentos diferentes.)"
@@ -989,7 +1210,7 @@ _role:
   priority: "Prioridade"
   _priority:
     low: "Baixa"
-    middle: "Média"
+    middle: "Médio"
     high: "Alta"
   _options:
     gtlAvailable: "Visualizar Linha do Tempo Global"
@@ -1038,9 +1259,11 @@ _emailUnavailable:
   mx: "O servidor de informado é inválido"
   smtp: "O servidor de e-mail não está respondendo"
 _ffVisibility:
-  public: "Publicar"
+  public: "Público"
   followers: "Visível apenas para seguidores"
+  private: "Privado"
 _signup:
+  almostThere: "Quase pronto"
   emailAddressInfo: "Por favor, insira o seu endereço de e-mail. Ele não será divulgado."
   emailSent: "Um e-mail de confirmação foi enviado para o endereço de e-mail fornecido ({email}). Acesse o link fornecido no e-mail para concluir a criação de sua conta."
 _accountDelete:
@@ -1052,6 +1275,8 @@ _accountDelete:
   inProgress: "A exclusão está em andamento"
 _ad:
   back: "Voltar"
+  reduceFrequencyOfThisAd: "Diminuir frequência deste anúncio"
+  hide: "Não exibir anúncios"
 _forgotPassword:
   enterEmail: "Por favor, insira o endereço de e-mail usado no cadastro de sua conta. Um link para redefinição de senha será enviado para esse endereço."
   ifNoEmail: "Caso você não tenha registrado um endereço de e-mail, por favor, entre em contato com o administrador."
@@ -1072,8 +1297,18 @@ _preferencesBackups:
 _channel:
   featured: "Destaques"
   following: "Seguindo"
+  usersCount: "usuários ativos"
+  notesCount: "notas"
+  nameAndDescription: "Nome e descrição"
+_menuDisplay:
+  sideFull: "Exibir painel lateral inteiro"
+  top: "Exibir barra superior"
+  hide: "Ocultar"
+_instanceMute:
+  instanceMuteDescription: "Todas as notas e repostagens do servidor configurado serão silenciados, incluindo respostas aos usuários do servidor mutado."
 _theme:
   description: "Descrição"
+  alpha: "Opacidade"
   deleteConstantConfirm: "Confirma a exclusão da constante {const}?"
   keys:
     mention: "Menção"
@@ -1160,7 +1395,7 @@ _poll:
   canMultipleVote: "Permitir múltipla seleção"
   vote: "Votar em enquetes"
 _visibility:
-  home: "casa"
+  home: "Início"
   followers: "Seguidores"
   followersDescription: "Tornar visível apenas para os meus seguidores"
 _profile:
@@ -1175,7 +1410,7 @@ _exportOrImport:
 _charts:
   federation: "União"
 _timelines:
-  home: "casa"
+  home: "Início"
 _play:
   new: "Criar  Play"
   edit: "Editar Play"
@@ -1205,13 +1440,14 @@ _notification:
   youGotMention: "{name} te mencionou"
   youGotReply: "{name} te respondeu"
   youGotQuote: "{name} te citou"
+  youRenoted: "Repostagens de {name}"
   youWereFollowed: "Você tem um novo seguidor"
   youReceivedFollowRequest: "Você recebeu um pedido de seguidor"
   yourFollowRequestAccepted: "Seu pedido de seguidor foi aceito"
   pollEnded: "Os resultados da enquete agora estão disponíveis"
   emptyPushNotificationMessage: "As notificações de alerta foram atualizadas"
   _types:
-    all: "Todos"
+    all: "Todas"
     follow: "Seguindo"
     mention: "Menção"
     reply: "Respostas"
@@ -1257,3 +1493,4 @@ _webhookSettings:
   _events:
     follow: "Quando seguindo um usuário"
     followed: "Quando sendo seguido"
+    renote: "Quando repostado"

locales/ro-RO.yml

@@ -328,7 +328,6 @@ invite: "Invită"
 driveCapacityPerLocalAccount: "Capacitatea Drive-ului per utilizator local"
 driveCapacityPerRemoteAccount: "Capacitatea Drive-ului per utilizator extern"
 inMb: "În megabytes"
-iconUrl: "URL-ul iconiței"
 bannerUrl: "URL-ul imaginii de banner"
 backgroundImageUrl: "URL-ul imaginii de fundal"
 basicInfo: "Informații de bază"
@@ -630,6 +629,9 @@ sent: "Trimite"
 searchByGoogle: "Caută"
 file: "Fișiere"
 show: "Arată"
+icon: "Avatar"
+replies: "Răspunde"
+renotes: "Re-notează"
 _role:
   _priority:
     middle: "Mediu"

locales/ru-RU.yml

@@ -354,7 +354,6 @@ invite: "Пригласить"
 driveCapacityPerLocalAccount: "Объём диска на одного локального пользователя"
 driveCapacityPerRemoteAccount: "Объём диска на одного пользователя с другого сайта"
 inMb: "В мегабайтах"
-iconUrl: "Ссылка на аватар"
 bannerUrl: "Ссылка на изображение в шапке"
 backgroundImageUrl: "Ссылка на фоновое изображение"
 basicInfo: "Общая информация"
@@ -680,6 +679,7 @@ createNewClip: "Новая подборка"
 unclip: "Убрать из подборки"
 confirmToUnclipAlreadyClippedNote: "Эта заметка уже есть в подборке «{name}». Удалить из этой подборки?"
 public: "Общедоступно"
+private: "Показываются только вам"
 i18nInfo: "Misskey переводят на разные языки добровольцы со всего света. Ваша помощь тоже пригодится здесь: {link}."
 manageAccessTokens: "Управление токенами доступа"
 accountInfo: "Сведения об учётной записи"
@@ -1016,23 +1016,66 @@ retryAllQueuesConfirmTitle: "Хотите попробовать ещё раз?"
 retryAllQueuesConfirmText: "Нагрузка на сервер может увеличиться"
 enableChartsForRemoteUser: "Создание диаграмм для удалённых пользователей"
 enableChartsForFederatedInstances: "Создание диаграмм для удалённых серверов"
-largeNoteReactions: "Показывать большие реакции на заметки"
 noteIdOrUrl: "ID или ссылка на заметку"
 video: "Видео"
 videos: "Видео"
 dataSaver: "Экономия трафика"
 accountMigration: "Перенести учётную запись"
 accountMoved: "Учетная запись перенесена"
+accountMovedShort: "Эта учётная запись перемещена"
 operationForbidden: "Эта операция невозможна."
+forceShowAds: "Всегда отображать рекламу"
 addMemo: "Добавить заметку"
 editMemo: "Редактировать заметку"
 reactionsList: "Реакции"
 renotesList: "Репосты"
 notificationDisplay: "Отображение уведомления"
 leftTop: "Верхний левый угол"
+rightTop: "Сверху справа"
+leftBottom: "Снизу слева"
+rightBottom: "Снизу справа"
+vertical: "Вертикальная"
 horizontal: "Сбоку"
+position: "Позиция"
+serverRules: "Правила сервера"
+pleaseConfirmBelowBeforeSignup: "Для регистрации на данном сервере, необходимо согласится с нижеследующими положениями."
+pleaseAgreeAllToContinue: "Чтобы продолжить, необходимо поставить отметки во всех полях \"согласен\"."
+continue: "Продолжить"
+preservedUsernames: "Зарезервированные имена пользователей"
+preservedUsernamesDescription: "Перечислите зарезервированные имена пользователей, отделяя их строками. Они станут недоступны при создании учётной записи. Это ограничение не применяется при создании учётной записи администраторами. Также, уже существующие учётные записи останутся без изменений."
+createNoteFromTheFile: "Создать заметку из этого файла"
+archive: "Архив"
+channelArchiveConfirmTitle: "Переместить {name} в архив?"
+channelArchiveConfirmDescription: "Архивированные каналы перестанут отображаться в списке каналов или результатах поиска. В них также нельзя будет добавлять новые записи."
+displayOfNote: "Отображение заметок"
+initialAccountSetting: "Настройка профиля"
 youFollowing: "Подписки"
+preventAiLearning: "Отказаться от использования в машинном обучении (Генеративный ИИ)"
 options: "Настройки ролей"
+specifyUser: "Указанный пользователь"
+failedToPreviewUrl: "Предварительный просмотр недоступен"
+update: "Обновить"
+later: "Позже"
+goToMisskey: "К Misskey"
+additionalEmojiDictionary: "Дополнительные словари эмодзи"
+installed: "Установлено"
+branding: "Бренд"
+expirationDate: "Дата истечения"
+unused: "Неиспользуемый"
+expired: "Срок действия приглашения истёк"
+doYouAgree: "Согласны?"
+icon: "Аватар"
+replies: "Ответить"
+renotes: "Репост"
+_initialAccountSetting:
+  accountCreated: "Аккаунт успешно создан!"
+  letsStartAccountSetup: "Давайте настроим вашу учётную запись."
+  profileSetting: "Настройки профиля"
+  privacySetting: "Настройки конфиденциальности"
+  initialAccountSettingCompleted: "Первоначальная настройка успешно завершена!"
+  skipAreYouSure: "Пропустить настройку?"
+_serverSettings:
+  iconUrl: "Адрес на иконку роли"
 _achievements:
   earnedAt: "Разблокировано в"
   _types:
@@ -1569,14 +1612,12 @@ _2fa:
   step1: "Прежде всего, установите на устройство приложение для аутентификации, например, {a} или {b}."
   step2: "Далее отсканируйте отображаемый QR-код при помощи приложения."
   step2Click: "Нажав на QR-код, вы можете зарегистрироваться с помощью приложения для аутентификации или брелка для ключей, установленного на вашем устройстве."
-  step2Url: "Если пользуетесь приложением на компьютере, можете ввести в него эту строку (URL):"
   step3Title: "Введите проверочный код"
   step3: "И наконец, введите код, который покажет приложение."
   step4: "Теперь при каждом входе на сайт вам нужно будет вводить код из приложения аналогичным образом."
   securityKeyNotSupported: "Ваш браузер не поддерживает ключи безопасности."
   registerTOTPBeforeKey: "Чтобы зарегистрировать ключ безопасности и пароль, сначала настройте приложение аутентификации."
   securityKeyInfo: "Вы можете настроить вход с помощью аппаратного ключа безопасности, поддерживающего FIDO2, или отпечатка пальца или PIN-кода на устройстве."
-  chromePasskeyNotSupported: "В настоящее время Chrome не поддерживает пароль-ключи."
   registerSecurityKey: "Зарегистрируйте ключ безопасности ・Passkey"
   securityKeyName: "Введите имя для ключа"
   tapSecurityKey: "Пожалуйста, следуйте инструкциям в вашем браузере, чтобы зарегистрировать свой ключ безопасности или пароль"
@@ -1899,6 +1940,7 @@ _deck:
     channel: "Каналы"
     mentions: "Упоминания"
     direct: "Личное"
+    roleTimeline: "История Ролей"
 _dialog:
   charactersExceeded: "Превышено максимальное количество символов! У вас {current} / из   {max}"
   charactersBelow: "Это ниже минимального количества символов! У вас {current} / из {min}"
@@ -1906,5 +1948,6 @@ _disabledTimeline:
   title: "Лента отключена"
   description: "Ваша текущая роль не позволяет пользоваться этой лентой."
 _webhookSettings:
+  createWebhook: "Создать вебхук"
   name: "Название"
   active: "Вкл."

locales/sk-SK.yml

@@ -337,7 +337,6 @@ invite: "Pozvať"
 driveCapacityPerLocalAccount: "Kapacita disku pre používateľa"
 driveCapacityPerRemoteAccount: "Kapacita disku pre vzdialeného používateľa"
 inMb: "V megabajtoch"
-iconUrl: "Favicon URL"
 bannerUrl: "URL obrázku bannera"
 backgroundImageUrl: "URL obrázku pozadia"
 basicInfo: "Základné informácie"
@@ -654,6 +653,7 @@ createNewClip: "Vytvoriť nový klip"
 unclip: "Odopnúť"
 confirmToUnclipAlreadyClippedNote: "Táto poznámka je už pripnutá ako \"{name}\". Naozaj ju chcete odopnúť?"
 public: "Verejné"
+private: "Súkromné"
 i18nInfo: "Misskey je prekladaný do rôznych jazykov dobrovoľníkmi. Pomôcť môžete na {link}."
 manageAccessTokens: "Spravovať prístupové tokeny"
 accountInfo: "Informácie o účte"
@@ -918,6 +918,9 @@ pleaseDonate: "Misskey je bezplatný softvér, ktorý používa {host}. Prosím,
 color: "Farba"
 horizontal: "Strana"
 youFollowing: "Sledované"
+icon: "Avatar"
+replies: "Odpovedať"
+renotes: "Preposlať"
 _role:
   priority: "Priorita"
   _priority:
@@ -1147,7 +1150,6 @@ _2fa:
   alreadyRegistered: "Už ste zaregistrovali 2-faktorové autentifikačné zariadenie."
   step1: "Najprv si nainštalujte autentifikačnú aplikáciu (napríklad {a} alebo {b}) na svoje zariadenie."
   step2: "Potom, naskenujte QR kód zobrazený na obrazovke."
-  step2Url: "Do aplikácie zadajte nasledujúcu URL adresu:"
   step3: "Nastavenie dokončíte zadaním tokenu z vašej aplikácie."
   step4: "Od teraz, všetky ďalšie prihlásenia budú vyžadovať prihlasovací token."
   securityKeyInfo: "Okrem odtlačku prsta alebo PIN autentifikácie si môžete nastaviť autentifikáciu cez hardvérový bezpečnostný kľúč podporujúci FIDO2 a tak ešte viac zabezpečiť svoj účet."

locales/sv-SE.yml

@@ -337,7 +337,6 @@ registration: "Registrera"
 enableRegistration: "Aktivera registrering av nya användare"
 invite: "Inbjudan"
 inMb: "I megabyte"
-iconUrl: "URL till profilbilden"
 bannerUrl: "URL till banner-bilden"
 basicInfo: "Grundläggande info"
 pinnedUsers: "Fästa användare"
@@ -485,6 +484,9 @@ windowRestore: "Återställ"
 pleaseDonate: "Misskey är en gratis programvara som används på {host}. Donera gärna för att göra utvecklingen ständigt, tack!"
 resetPasswordConfirm: "Återställ verkligen ditt lösenord?"
 dataSaver: "Databesparing"
+icon: "Profilbild"
+replies: "Svara"
+renotes: "Omnotera"
 _achievements:
   _types:
     _open3windows:

locales/th-TH.yml

@@ -45,6 +45,7 @@ pin: "ปักหมุดไปยังโปรไฟล์"
 unpin: "เลิกปักหมุดจากโปรไฟล์"
 copyContent: "คัดลอกเนื้อหา"
 copyLink: "คัดลอกลิงก์"
+copyLinkRenote: "คัดลอกลิงก์รีโน้ต"
 delete: "ลบ"
 deleteAndEdit: "ลบและแก้ไข"
 deleteAndEditConfirm: "นายแน่ใจแล้วเหรอ? ว่าต้องการลบโน้ตนี้และแก้ไข คุณอาจจะสูญเสียการโต้ตอบ, โน้ต, และการตอบกลับทั้งหมดได้นะ"
@@ -74,7 +75,7 @@ import: "นำเข้า"
 export: "นำออก"
 files: "ไฟล์"
 download: "ดาวน์โหลด"
-driveFileDeleteConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการลบไฟล์ \"{name}\" โน้ตย่อที่แนบมากับไฟล์นี้ก็จะถูกลบด้วยนะ"
+driveFileDeleteConfirm: "คุณต้องการลบไฟล์ \"{name}\" ใช่หรือไม่? โน้ตย่อที่แนบมากับไฟล์นี้ก็จะถูกลบไปด้วย"
 unfollowConfirm: "นายแน่ใจแล้วหรอว่าต้องการเลิกติดตาม {name}?"
 exportRequested: "เมื่อคุณได้ร้องขอการส่งออก อาจจะต้องใช้เวลาสักครู่ และจะถูกเพิ่มในไดรฟ์ของคุณเมื่อเสร็จสิ้นแล้ว"
 importRequested: "เมื่อคุณได้ร้องขอการนำเข้า อาจจะต้องใช้เวลาสักครู่นะ"
@@ -92,8 +93,8 @@ somethingHappened: "อุ๊ย ! มีอะไรบางอย่างผ
 retry: "ลองใหม่อีกครั้ง"
 pageLoadError: "เกิดข้อผิดพลาดในการโหลดหน้านี้"
 pageLoadErrorDescription: "โดยปกติแล้วมักจะเกิดจากข้อผิดพลาดของเครือข่ายหรือแคชของเบราว์เซอร์ ลองล้างแคชแล้วลองใหม่อีกครั้งหลังจากรอสักครู่ "
-serverIsDead: "เซิร์ฟเวอร์นี้ไม่มีการตอบสนอง ได้โปรดกรุณารอสักครู่แล้วลองใหม่อีกครั้งนะ"
+serverIsDead: "เซิร์ฟเวอร์นี้ไม่มีการตอบสนอง โปรดกรุณารอสักครู่แล้วลองใหม่อีกครั้ง"
-youShouldUpgradeClient: "หากต้องการดูหน้านี้ได้โปรดกรุณา รีเซ็ตเพื่ออัปเดตไคลเอ็นต์ของคุณนะ"
+youShouldUpgradeClient: "หากต้องการดูหน้านี้ กรุณาโหลดหน้าใหม่เพื่ออัปเดตไคลเอ็นต์ของคุณ"
 enterListName: "ใส่ชื่อสำหรับรายการลิสต์"
 privacy: "ความเป็นส่วนตัว"
 makeFollowManuallyApprove: "ติดตามคำขอที่ต้องได้รับการอนุมัติ"
@@ -109,7 +110,7 @@ unrenote: "เลิกรีโน้ต"
 renoted: "รีโน้ตแล้ว"
 cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตไว้ใหม่ได้นะ"
 cantReRenote: "ไม่สามารถรีโน้ตเอาไว้ใหม่ได้นะ"
-quote: "อ้างคำพูด"
+quote: "อ้างอิง"
 inChannelRenote: "รีโน้ตช่องแชลแนลเท่านั้น"
 inChannelQuote: "อ้างช่องเท่านั้น"
 pinnedNote: "โน้ตที่ปักหมุดเอาไว้"
@@ -137,7 +138,7 @@ suspend: "ถูกระงับ"
 unsuspend: "ยกเลิกระงับ"
 blockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต้องการบล็อกบัญชีนี้"
 unblockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต้องการปลดบล็อคบัญชีนี้"
-suspendConfirm: "นายแน่ใจแล้วเหรอว่าต้องการระงับบัญชีนี้อ่ะ?"
+suspendConfirm: "แน่ใจว่าคุณต้องการระงับบัญชีนี้?"
 unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
 selectList: "เลือกรายการ"
 editList: "แก้ไขรายการ"
@@ -156,6 +157,7 @@ addEmoji: "แทรกอีโมจิ"
 settingGuide: "การตั้งค่าที่แนะนำ"
 cacheRemoteFiles: "แคชไฟล์ระยะไกล"
 cacheRemoteFilesDescription: "เมื่อปิดใช้งานการตั้งค่านี้ ไฟล์ระยะไกลนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกล แต่กรณีการปิดใช้งานนี้จะช่วยลดปริมาณการใช้พื้นที่จัดเก็บข้อมูล แต่เพิ่มปริมาณการใช้งาน เพราะเนื่องจากจะไม่มีการสร้างภาพขนาดย่อ"
+youCanCleanRemoteFilesCache: "คุณสามารถล้างแคชได้โดยคลิกที่ปุ่ม 🗑️ ในมุมมองการจัดการไฟล์"
 cacheRemoteSensitiveFiles: "ไฟล์ระยะไกลที่มีความละเอียดอ่อนแคช"
 cacheRemoteSensitiveFilesDescription: "เมื่อปิดการใช้งานแล้วการตั้งค่านี้ ไฟล์รีโมตที่มีความละเอียดอ่อนนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกลโดยที่ไม่มีการแคช"
 flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอท"
@@ -254,7 +256,7 @@ imageUrl: "url รูปภาพ"
 remove: "ลบ"
 removed: "ถูกลบไปแล้ว"
 removeAreYouSure: "นายแน่ใจจริงหรอว่าต้องการที่จะลบออก \"{x}\""
-deleteAreYouSure: "นายแน่ใจจริงหรอว่าต้องการที่จะลบออก \"{x}\""
+deleteAreYouSure: "ต้องการลบ {x} หรือไม่คะ?"
 resetAreYouSure: "รีเซ็ตเลยไหม"
 saved: "บันทึกแล้ว"
 messaging: "แชท"
@@ -308,8 +310,8 @@ renameFolder: "เปลี่ยนชื่อโฟลเดอร์"
 deleteFolder: "ลบโฟลเดอร์"
 addFile: "เพิ่มไฟล์"
 emptyDrive: "ไดรฟ์ของคุณว่างเปล่านะ"
-emptyFolder: "โฟลเดอร์นี้น่าจะว่างเปล่านะ"
+emptyFolder: "โฟลเดอร์นี้ว่างเปล่า"
-unableToDelete: "ไม่สามารถลบออกได้นะ"
+unableToDelete: "ไม่สามารถลบออกได้"
 inputNewFileName: "ป้อนชื่อไฟล์ใหม่นะ"
 inputNewDescription: "กรุณาใส่แคปชั่นใหม่"
 inputNewFolderName: "กรุณาใส่ชื่อโฟลเดอร์ใหม่นะ\n"
@@ -354,7 +356,6 @@ invite: "เชิญชวน"
 driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ภายในเครื่อง"
 driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"
 inMb: "เป็นเมกะไบต์"
-iconUrl: "ไอคอน URL"
 bannerUrl: "URL รูปภาพแบนเนอร์"
 backgroundImageUrl: "URL ภาพพื้นหลัง"
 basicInfo: "ข้อมูลเบื้องต้น"
@@ -363,7 +364,7 @@ pinnedUsersDescription: "ลิสต์ชื่อผู้ใช้โดย
 pinnedPages: "หน้าที่ปักหมุด"
 pinnedPagesDescription: "ป้อนเส้นทางของหน้าที่คุณต้องการตรึงไว้ที่หน้าแรกของอินสแตนซ์นี้ โดยคั่นด้วยตัวแบ่งบรรทัด"
 pinnedClipId: "ID ของคลิปที่จะปักหมุด"
-pinnedNotes: "โน้ตที่ปักหมุดเอาไว้"
+pinnedNotes: "โน้ตที่ปักหมุดไว้"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "เปิดใช้ hCaptcha"
 hcaptchaSiteKey: "คีย์ไซต์"
@@ -404,12 +405,13 @@ recentlyDiscoveredUsers: "ผู้ใช้ที่เพิ่งค้นพ
 exploreUsersCount: "มีผู้ใช้ {จำนวน} ราย"
 exploreFediverse: "สำรวจเฟดดิเวิร์ส"
 popularTags: "แท็กยอดนิยม"
-userList: "รายการ"
+userList: "ลิสต์"
 about: "เกี่ยวกับ"
 aboutMisskey: "เกี่ยวกับ Misskey"
 administrator: "ผู้ดูแลระบบ"
 token: "โทเค็น"
 2fa: "การยืนยันตัวตนแบบสองชั้น"
+setupOf2fa: "ตั้งค่าการยืนยันตัวตนแบบสองชั้น"
 totp: "แอป Authenticator"
 totpDescription: "ใช้แอปยืนยันตัวตนเพื่อป้อนรหัสผ่านแบบใช้ครั้งเดียว"
 moderator: "ผู้ควบคุม"
@@ -444,7 +446,7 @@ text: "ข้อความ"
 enable: "เปิดใช้งาน"
 next: "ถัด​ไป"
 retype: "พิมพ์รหัสอีกครั้ง"
-noteOf: "โน้ต โดย {ผู้ใช้งาน}"
+noteOf: "โน้ต โดย {user}"
 quoteAttached: "อ้างอิง"
 quoteQuestion: "นายต้องการที่จะอ้างอิงหรอ?"
 noMessagesYet: "ยังไม่มีข้อความนะ"
@@ -653,6 +655,7 @@ behavior: "พฤติกรรม"
 sample: "ตัวอย่าง"
 abuseReports: "รายงาน"
 reportAbuse: "รายงาน"
+reportAbuseRenote: "รายงานรีโน้ต"
 reportAbuseOf: "รายงาน {ชื่อ}"
 fillAbuseReportDescription: "กรุณากรอกรายละเอียดเกี่ยวกับรายงานนี้ หากเป็นเรื่องเกี่ยวกับโน้ตโดยเฉพาะ ได้โปรดระบุ URL"
 abuseReported: "เราได้ส่งรายงานของคุณไปแล้ว ขอบคุณมากๆนะ"
@@ -680,6 +683,7 @@ createNewClip: "สร้างคลิปใหม่"
 unclip: "ลบคลิป"
 confirmToUnclipAlreadyClippedNote: "โน้ตนี้เป็นส่วนหนึ่งของคลิป \"{name}\" แล้ว คุณต้องการลบออกจากคลิปนี้แทนอย่างงั้นหรอ?"
 public: "สาธารณะ"
+private: "ส่วนตัว"
 i18nInfo: "Misskey กำลังได้รับการแปลเป็นภาษาต่างๆ โดยอาสาสมัคร คุณสามารถช่วยเหลือได้ที่ {link}"
 manageAccessTokens: "การจัดการโทเค็นการเข้าถึง"
 accountInfo: "ข้อมูลบัญชี"
@@ -957,7 +961,7 @@ show: "แสดงผล"
 neverShow: "ไม่ต้องแสดงข้อความนี้อีก"
 remindMeLater: "ไว้ครั้งหน้าแล้วกัน"
 didYouLikeMisskey: "คุณเคยชอบ Misskey ไหม?"
-pleaseDonate: "{host} ใช้ซอฟต์แวร์ฟรี Misskey เราขอขอบคุณการบริจาคของคุณอย่างสูงเพื่อให้การพัฒนา Misskey สามารถดำเนินต่อไปได้นะ!"
+pleaseDonate: "Misskey เป็นซอฟต์แวร์ฟรีที่ใช้งานโดย {host} เราขอขอบคุณการสนับสนุนของคุณอย่างสูงเพื่อให้การพัฒนา Misskey สามารถดำเนินต่อไปได้!"
 roles: "บทบาท"
 role: "บทบาท"
 noRole: "ไม่พบบทบาท"
@@ -1018,7 +1022,6 @@ retryAllQueuesConfirmText: "สิ่งนี้จะเพิ่มการ
 enableChartsForRemoteUser: "สร้างแผนภูมิข้อมูลผู้ใช้ระยะไกล"
 enableChartsForFederatedInstances: "สร้างแผนภูมิข้อมูลอินสแตนซ์ระยะไกล"
 showClipButtonInNoteFooter: "เพิ่ม \"คลิป\" เพื่อบันทึกเมนูการทำงาน"
-largeNoteReactions: "ขยายรีแอคชั่นการแสดงผล"
 noteIdOrUrl: "โน้ต ID หรือ URL"
 video: "วีดีโอ"
 videos: "วีดีโอ"
@@ -1094,6 +1097,20 @@ expired: "หมดอายุแล้ว"
 doYouAgree: "ยอมรับมั้ย?"
 beSureToReadThisAsItIsImportant: "กรุณาอ่านข้อมูลที่สำคัญอันนี้"
 iHaveReadXCarefullyAndAgree: "ฉันได้อ่านข้อความ \"{x}\" และยินยอม"
+dialog: "ไดอะล็อก"
+icon: "ไอคอน"
+forYou: "สำหรับคุณ"
+replies: "ตอบกลับ"
+renotes: "รีโน้ต"
+loadReplies: "แสดงการตอบกลับ"
+loadConversation: "แสดงบทสนทนา"
+_announcement:
+  forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
+  needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
+  end: "ประกาศเก็บถาวร"
+  tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
+  readConfirmTitle: "ทำเครื่องหมายบอกว่าอ่านแล้วเลยมั้ย?"
+  readConfirmText: "การดำเนินการนี้จะทำเครื่องหมายเนื้อหาของ \"{title}\" บอกว่าอ่านแล้วนะ"
 _initialAccountSetting:
   accountCreated: "คุณได้สร้างบัญชีของคุณสำเร็จเรียบร้อยแล้ว!"
   letsStartAccountSetup: "สำหรับผู้เริ่มต้นมาตั้งค่าโปรไฟล์ของคุณกันเถอะ"
@@ -1105,12 +1122,14 @@ _initialAccountSetting:
   followUsers: "ลองติดตามผู้ใช้บางคนที่คุณอาจจะสนใจเพื่อสร้างไทม์ไลน์ของคุณสิ !"
   pushNotificationDescription: "กำลังเปิดใช้งานการแจ้งเตือนแบบพุชจะช่วยให้คุณได้รับการแจ้งเตือนจาก {name} โดยตรงบนอุปกรณ์ของคุณนะ"
   initialAccountSettingCompleted: "ตั้งค่าโปรไฟล์เสร็จสมบูรณ์แล้ว!"
-  haveFun: "สนุกกับ {name}!"
+  haveFun: "ขอให้สนุก {name}!"
   ifYouNeedLearnMore: "ถ้าหากคุณต้องการเรียนรู้เพิ่มเติมเกี่ยวกับวิธีใช้ {ชื่อ} (Misskey) กรุณาไปที่ {link}"
   skipAreYouSure: "ต้องการข้ามการตั้งค่าโปรไฟล์จริงๆแบบนั้นหรอ?"
   laterAreYouSure: "ต้องการตั้งค่าโปรไฟล์ในภายหลังจริงๆอย่างงั้นหรอ?"
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
+_serverSettings:
+  iconUrl: "ไอคอน URL"
 _accountMigration:
   moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
@@ -1130,8 +1149,8 @@ _achievements:
   earnedAt: "ได้รับเมื่อ"
   _types:
     _notes1:
-      title: "เพียงแค่ตั้งค่า msky ของฉัน"
+      title: "just setting up my msky"
-      description: "โพสต์โน้ตครั้งแรกของคุณ"
+      description: "โพสต์โน้ตแรกของคุณ"
       flavor: "ขอให้มีช่วงเวลาที่ดีกับ Misskey นะคะ!"
     _notes10:
       title: "โน้ตบางอย่าง"
@@ -1290,7 +1309,7 @@ _achievements:
     _iLoveMisskey:
       title: "ฉันรัก Misskey"
       description: "โพสต์ \"I ❤ #Misskey\""
-      flavor: "ทีมผู้พัฒนา Misskey ได้ขอบคุณสำหรับการสนับสนุนของคุณ!"
+      flavor: "ขอบคุณที่ใช้ Misskey! by ทีมผู้พัฒนา"
     _foundTreasure:
       title: "ล่าสมบัติ"
       description: "คุณพบสมบัติที่ซ่อนอยู่"
@@ -1298,7 +1317,7 @@ _achievements:
       title: "พักผ่อนสักหน่อย"
       description: "ใช้เวลา 30 นาทีบน Misskey"
     _client60min:
-      title: "ไม่พบ \"Miss\" ใน Misskey "
+      title: "ไม่มี \"Miss\" ใน Misskey "
       description: "เปิด Misskey ค้างไว้แล้วอย่างน้อย 60 นาที"
     _noteDeletedWithin1min:
       title: "ไม่เป็นไร"
@@ -1365,6 +1384,8 @@ _achievements:
       title: "Brain Diver"
       description: "โพสต์ลิงก์ไปยัง Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "ทดสอบโอเวอร์โฟลว์"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
@@ -1447,7 +1468,7 @@ _sensitiveMediaDetection:
 _emailUnavailable:
   used: "ที่อยู่อีเมลนี้ได้ถูกใช้ไปแล้ว"
   format: "รูปแบบของที่อยู่อีเมลนี้ไม่ถูกต้อง"
-  disposable: "ที่อยู่อีเมลที่ใช้แล้วทิ้งนั้นไม่สามารถใช้ได้"
+  disposable: "ไม่สามารถใช้อีเมลชั่วคราวได้"
   mx: "เซิร์ฟเวอร์อีเมลนี้ไม่ถูกต้อง"
   smtp: "เซิร์ฟเวอร์อีเมลนี้ไม่มีการตอบสนอง"
 _ffVisibility:
@@ -1517,9 +1538,9 @@ _aboutMisskey:
   contributors: "ผู้สนับสนุนหลัก"
   allContributors: "ผู้มีส่วนร่วมทั้งหมด"
   source: "ซอร์สโค้ด"
-  translation: "รับแปลภาษา Misskey"
+  translation: "แปลภาษา Misskey"
   donate: "บริจาคให้กับ Misskey"
-  morePatrons: "เราขอขอบคุณสำหรับความช่วยเหลือจากผู้ช่วยอื่นๆ ที่ไม่ได้ระบุไว้ที่นี่นะ ขอขอบคุณ! 🥰"
+  morePatrons: " ขอบคุณทุกท่านที่ร่วมกันช่วยเหลือตลอดมานะคะ 🥰"
   patrons: "สมาชิกพันธมิตร"
 _displayOfSensitiveMedia:
   respect: "ซ่อนสื่อทำเครื่องหมายบอกว่าละเอียดอ่อน"
@@ -1679,14 +1700,13 @@ _2fa:
   step1: "ขั้นตอนแรก ติดตั้งแอปยืนยันตัวตน (เช่น {a} หรือ {b}) บนอุปกรณ์ของคุณ"
   step2: "จากนั้นสแกนรหัส QR ที่แสดงบนหน้าจอนี้"
   step2Click: "การคลิกที่รหัส QR นี้จะช่วยให้คุณนั้นสามารถลงทะเบียน 2FA กับคีย์ความปลอดภัยหรือแอปตรวจสอบความถูกต้องของโทรศัพท์ได้"
-  step2Url: "คุณยังสามารถป้อนบน URL นี้หากคุณใช้โปรแกรมเดสก์ท็อป:"
   step3Title: "ป้อนรหัสยืนยัน"
   step3: "ป้อนโทเค็นที่แอปของคุณให้มาเพื่อเสร็จสิ้นการตั้งค่า"
+  setupCompleted: "ตั้งค่าสำเร็จแล้ว"
   step4: "นับจากนี้เป็นต้นไปการพยายามเข้าสู่ระบบในอนาคตนั้น อาจจะต้องขอโทเค็นในการเข้าสู่ระบบดังกล่าว"
   securityKeyNotSupported: "เบราว์เซอร์ของคุณไม่รองรับคีย์ความปลอดภัยนะ"
   registerTOTPBeforeKey: "กรุณาตั้งค่าแอปยืนยันตัวตนเพื่อลงทะเบียนรหัสความปลอดภัยหรือรหัสผ่าน"
   securityKeyInfo: "นอกจากนี้การตรวจสอบความถูกต้องด้วยลายนิ้วมือหรือ PIN แล้ว คุณยังสามารถตั้งค่าการตรวจสอบสิทธิ์ผ่านคีย์ความปลอดภัยของฮาร์ดแวร์ที่รองรับ FIDO2 เพื่อเพิ่มความปลอดภัยให้กับบัญชีของคุณ"
-  chromePasskeyNotSupported: "ขณะนี้ยังไม่รองรับรหัสผ่านของ Chrome"
   registerSecurityKey: "ลงทะเบียนรหัสความปลอดภัยหรือรหัสผ่าน"
   securityKeyName: "ป้อนชื่อคีย์"
   tapSecurityKey: "กรุณาทำตามเบราว์เซอร์ของคุณเพื่อลงทะเบียนรหัสความปลอดภัยหรือรหัสผ่าน"
@@ -1697,6 +1717,7 @@ _2fa:
   renewTOTPConfirm: "วิธีการแบบนี้จะทําให้รหัสยืนยันจากแอพก่อนหน้าของคุณหยุดทํางานเลยนะ"
   renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
   renewTOTPCancel: "ไม่เป็นไร"
+  backupCodes: "รหัสสำรองข้อมูล"
 _permissions:
   "read:account": "ดูข้อมูลบัญชีของคุณ"
   "write:account": "แก้ไขข้อมูลบัญชีของคุณ"
@@ -1730,6 +1751,10 @@ _permissions:
   "write:gallery": "แก้ไขแกลเลอรี่ของคุณ"
   "read:gallery-likes": "ดูรายการโพสต์ในแกลเลอรีที่ชอบของคุณ"
   "write:gallery-likes": "แก้ไขรายการโพสต์ในแกลเลอรีที่ชอบของคุณ"
+  "read:flash": "วิว เพลย์"
+  "write:flash": "แก้ไขเพลย์"
+  "read:flash-likes": "ดูรายชื่อของไลค์ เพลย์"
+  "write:flash-likes": "แก้ไขรายชื่อของไลค์ เพลย์"
 _auth:
   shareAccessTitle: "การให้สิทธิ์แอปพลิเคชัน"
   shareAccess: "คุณต้องการอนุญาตให้ \"{name}\" เข้าถึงบัญชีนี้เลยมั้ย?"
@@ -1768,7 +1793,7 @@ _widgets:
   photos: "รูปภาพ"
   digitalClock: "นาฬิกาดิจิตอล"
   unixClock: "นาฬิกา UNIX"
-  federation: "สหพันธ์"
+  federation: "Fediration"
   instanceCloud: "อินสแตนซ์คลาวด์"
   postForm: "แบบฟอร์มการโพสต์"
   slideshow: "แสดงภาพนิ่ง"
@@ -1778,7 +1803,7 @@ _widgets:
   serverMetric: "ตัวชี้วัดเซิร์ฟเวอร์"
   aiscript: "AiScript คอนโซล"
   aiscriptApp: "AiScript แอพ"
-  aichan: "เอไอ"
+  aichan: "ไอ"
   userList: "รายชื่อผู้ใช้"
   _userList:
     chooseList: "เลือกรายการ"
@@ -1965,6 +1990,10 @@ _notification:
   unreadAntennaNote: "เสาอากาศ {name}"
   emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
   achievementEarned: "รับความสำเร็จ"
+  testNotification: "ทดสอบการแจ้งเตือน"
+  checkNotificationBehavior: "ตรวจสอบลักษณะที่ปรากฏการแจ้งเตือน"
+  sendTestNotification: "ส่งทดสอบการแจ้งเตือน"
+  notificationWillBeDisplayedLikeThis: "การแจ้งเตือนมีลักษณะแบบนี้"
   _types:
     all: "ทั้งหมด"
     follow: "กำลังติดตาม"
@@ -2000,6 +2029,8 @@ _deck:
   introduction2: "คลิกที่เครื่องหมาย + ทางขวาของหน้าจอเพื่อเพิ่มคอลัมน์ใหม่ทุกครั้งที่คุณต้องการ"
   widgetsIntroduction: "กรุณาเลือก \"แก้ไขวิดเจ็ต\" ในเมนูคอลัมน์และเพิ่มวิดเจ็ต"
   useSimpleUiForNonRootPages: "แสดง UI ของ Root Page อย่างง่าย "
+  usedAsMinWidthWhenFlexible: "ความกว้างขั้นต่ำนั้นจะถูกใช้งานสำหรับสิ่งนี้เมื่อเปิดใช้งานตัวเลือก \"ปรับความกว้างอัตโนมัติ\" หากเลือกเปิดใช้งานแล้ว"
+  flexible: "ปรับความกว้างอัตโนมัติ"
   _columns:
     main: "หลัก"
     widgets: "วิดเจ็ต"

locales/tr-TR.yml

@@ -259,6 +259,7 @@ messaging: "Mesajlar"
 upload: "Yükle"
 keepOriginalUploading: "Orijinal görseli koru"
 keepOriginalUploadingDescription: "Orijinal olarak yüklenen görüntüyü olduğu gibi kaydeder. Kapatılırsa, yükleme sırasında web'de görüntülenecek bir sürüm oluşturulur."
+fromDrive: "Drive Dosyasından"
 fromUrl: "Bağlantıdan"
 uploadFromUrl: "Bağlantıdan yükle"
 uploadFromUrlDescription: "Yüklemek istediğiniz dosyanın bağlantısı"
@@ -305,12 +306,42 @@ renameFolder: "Klasörü Yeniden Adlandır"
 deleteFolder: "Klasörü sil"
 addFile: "Dosya ekle"
 emptyDrive: "Sürücü boş"
+emptyFolder: "Bu klasör boş"
+unableToDelete: "Silme mümkün değil"
+inputNewFileName: "Yeni dosya ismini girin"
+inputNewDescription: "Yeni bir başlık gir"
+inputNewFolderName: "Yeni klasör ismini girin"
+circularReferenceFolder: "Hedef klasör taşınan klasörün bir alt klasörü."
 hasChildFilesOrFolders: "Klasör boş olmadığından silinemiyor"
+copyUrl: "URL'yi kopyala"
+rename: "Yeniden adlandır"
+avatar: "Avatar"
+banner: "Banner"
+displayOfSensitiveMedia: "Hassas içerik gösterimi"
+whenServerDisconnected: "Sunucu bağlantısı kesildiğinde"
+disconnectedFromServer: "Sunucu bağlantısı koptu"
+reload: "Yenile"
 doNothing: "Bir şey yapma"
 reloadConfirm: "Zaman akışı yenilensin mi?"
+watch: "İzle"
+unwatch: "İzlemeyi bırak"
+accept: "Kabul et"
+reject: "Reddet"
+normal: "Normal"
+instanceName: "Sunucu ismi"
+instanceDescription: "Sunucu açıklaması"
 maintainerName: "Yönetici ismi"
+maintainerEmail: "Yöneticinin e-postası"
+tosUrl: "Hizmet Koşulları Bağlantısı"
+thisYear: "Bu yıl"
+thisMonth: "Bu ay"
+today: "Bugün"
 monthX: "{month} ay"
+pages: "Sayfalar"
+integration: "Entegrasyon"
 enableRegistration: "Kayıtlara izin ver"
+basicInfo: "Temel bilgiler"
+pinnedUsers: "Sabitlenmiş kullanıcılar"
 pinnedNotes: "Sabitlenen"
 manageAntennas: "Anten ayarları"
 userList: "Listeler"
@@ -322,6 +353,7 @@ smtpHost: "Sağlayıcı"
 smtpUser: "Kullanıcı Adı"
 smtpPass: "Şifre"
 notificationSetting: "Bildirim ayarları"
+instanceTicker: "Notların sunucu bilgileri"
 noCrawleDescription: "Arama motorlarından profilinde, notlarında, sayfalarında  vb. dolaşılmamasını ve dizine eklememesini talep et."
 clearCache: "Ön belleği temizle"
 onlineUsersCount: "{n} kullanıcı çevrim içi"
@@ -338,6 +370,9 @@ pushNotificationNotSupported: "Push bildirimleri sunucu veya tarayıcı tarafın
 noRole: "Rol bulunamadı"
 color: "Renk"
 addMemo: "Kısa not ekle"
+icon: "Avatar"
+replies: "yanıt"
+renotes: "vazgeçme"
 _accountDelete:
   started: "Silme işlemi başlatıldı"
 _email:

locales/uk-UA.yml

@@ -20,6 +20,7 @@ noNotes: "Немає нотаток"
 noNotifications: "Немає сповіщень"
 instance: "Інстанс"
 settings: "Налаштування"
+notificationSettings: "Параметри сповіщень"
 basicSettings: "Основні налаштування"
 otherSettings: "Інші налаштування"
 openInWindow: "Відкрити у вікні"
@@ -48,9 +49,12 @@ delete: "Видалити"
 deleteAndEdit: "Видалити й редагувати"
 deleteAndEditConfirm: "Ви впевнені, що хочете видалити цю нотатку та відредагувати її? Ви втратите всі реакції, поширення та відповіді на неї."
 addToList: "Додати до списку"
+addToAntenna: "Додати в антени"
 sendMessage: "Надіслати повідомлення"
 copyRSS: "Скопіювати RSS"
 copyUsername: "Скопіювати ім’я користувача"
+copyUserId: "Копіювати ID користувача"
+copyNoteId: "блокнот ID користувача"
 searchUser: "Пошук користувачів"
 reply: "Відповісти"
 loadMore: "Показати більше"
@@ -334,7 +338,6 @@ invite: "Запросити"
 driveCapacityPerLocalAccount: "Об'єм диска на одного локального користувача"
 driveCapacityPerRemoteAccount: "Об'єм диска на одного віддаленого користувача"
 inMb: "В мегабайтах"
-iconUrl: "URL аватара"
 bannerUrl: "URL банера"
 backgroundImageUrl: "URL-адреса фонового зображення"
 basicInfo: "Основна інформація"
@@ -644,6 +647,7 @@ createNewClip: "Створити нотатку"
 unclip: "Незакріплений"
 confirmToUnclipAlreadyClippedNote: "Ця нотатка вже включена до кліпу \"{name}\". Ви хочете виключити нотатку з цього кліпу?"
 public: "Публічний"
+private: "Приватне"
 i18nInfo: "Misskey перекладається на різні мови волонтерами. Ви можете допомогти: {link}"
 manageAccessTokens: "Керування токенами доступу"
 accountInfo: "Інформація про акаунт"
@@ -900,6 +904,9 @@ exploreOtherServers: "Знайти інший сервер"
 letsLookAtTimeline: "Перегляд історії"
 horizontal: "Збоку"
 youFollowing: "Підписки"
+icon: "Аватар"
+replies: "Відповісти"
+renotes: "Поширити"
 _achievements:
   earnedAt: "Відкрито"
   _types:
@@ -1331,7 +1338,6 @@ _2fa:
   alreadyRegistered: "Двофакторна автентифікація вже налаштована."
   step1: "Спершу встановіть на свій пристрій програму автентифікації (наприклад {a} або {b})."
   step2: "Потім відскануйте QR-код, який відображається на цьому екрані."
-  step2Url: "Ви також можете ввести цю URL-адресу, якщо використовуєте програму для ПК:"
   step3: "Щоб завершити налаштування, введіть токен, наданий вашою програмою."
   step4: "Відтепер будь-які майбутні спроби входу вимагатимуть такого токена."
   renewTOTPCancel: "Не зараз"

locales/uz-UZ.yml

@@ -43,8 +43,8 @@ alreadyFavorited: "allaqachon sevimlilar orasida"
 cantFavorite: "sevimlilarga qo'shib bo'lmadi"
 pin: "Profilga qadab qo'yish"
 unpin: "Profildan olib tashlash"
-copyContent: "kontentni nusxalash"
+copyContent: "Tarkibini nusxalash"
-copyLink: "Havolani nuxalash"
+copyLink: "Havolani nusxalash"
 delete: "O'chirib tashlash"
 deleteAndEdit: "O'chirish va tahrirlash"
 deleteAndEditConfirm: "O'chirib, tahrirlamoqchiligingizga ishonchingiz komilmi? Siz bu qaydga tegishli barcha reaktsiyalar va javoblarni yo'qotasiz."
@@ -156,6 +156,7 @@ addEmoji: "Emoji qo'shish"
 settingGuide: "Tavsiya qilingan sozlamalar"
 cacheRemoteFiles: "Tashqi fayllarni keshlash"
 cacheRemoteFilesDescription: "Ushbu sozlama o'chirilgan bo'lsa tashqi fayllar bevosita tashqi serverdan yuklanadi. Buni o'chirish ombor ishlatilishini kamaytiradi, lekin traffikni ko'paytiradi, chunki eskizlar generatsiya qilinmaydi."
+youCanCleanRemoteFilesCache: "Fayl menejeridagi 🗑️ tugmasi yordamida barcha keshlarni oʻchirib tashlashingiz mumkin."
 cacheRemoteSensitiveFiles: "Tashqi fayllarni keshlash"
 cacheRemoteSensitiveFilesDescription: "Bu sozlama oʻchiq boʻlsa, \"barcha ko'rishi mumkin bo'lmagan\" fayllar keshlashsiz toʻgʻridan-toʻgʻri masofaviy serverdan yuklanadi."
 flagAsBot: "Ushbu akkauntni bot sifatida belgilash"
@@ -246,6 +247,7 @@ newPasswordRetype: "Yangi parolni boshqatdan tering"
 attachFile: "Fayl biriktirish"
 more: "Ko'proq!"
 featured: "ta'kidlash"
+usernameOrUserId: "Foydalanuvchi nomi yoki identifikatori"
 noSuchUser: "Foydalanuvchi topilmadi"
 lookup: "So'rov"
 announcements: "Bildirishnomalar"
@@ -259,7 +261,10 @@ saved: "Saqlandi"
 messaging: "Suhbat"
 upload: "Yuklash"
 keepOriginalUploading: "Asl rasmni saqlang"
+keepOriginalUploadingDescription: "Rasmlarni yuklashda asl nusxasini saqlaydi. Agar o'chirilgan bo'lsa, brauzer yuklangandan keyin nashr qilish uchun rasm yaratadi."
+fromDrive: "Drive orqali"
 fromUrl: "URL dan"
+uploadFromUrl: "URL orqali yuklash"
 uploadFromUrlDescription: "Yuklamoqchi bo'lgan faylingizga havola"
 uploadFromUrlRequested: "yuklab olish so'ralgan"
 uploadFromUrlMayTakeTime: "Yuklash tugallanishi uchun biroz vaqt ketishi mumkin."
@@ -275,6 +280,7 @@ basicNotesBeforeCreateAccount: "Muhim qaydlar"
 termsOfService: "Foydalanish shartlari"
 start: "Boshlash"
 home: "Bosh sahifa"
+remoteUserCaution: "Bu foydalanuvchi uzoqda bo'lganligi sababli, ko'rsatilgan ma'lumotlar to'liq bo'lmasligi mumkin."
 activity: "Faollik"
 images: "Rasmlar"
 image: "Rasm"
@@ -308,11 +314,13 @@ unableToDelete: "O'chirilmadi"
 inputNewFileName: "Yangi fayl nomini kiriting"
 inputNewDescription: "Iltimos, yangi sarlavha kiriting."
 inputNewFolderName: "Yangi papka nomini kiriting"
+circularReferenceFolder: "Belgilangan papka siz ko'chirmoqchi bo'lgan jildning pastki jildidir."
 hasChildFilesOrFolders: "Bu papka boʻsh emas va uni oʻchirib boʻlmaydi."
 copyUrl: "Bog'lamadan nusxa olish"
 rename: "Qayta nomlash"
 avatar: "Avatar"
 banner: "Banner"
+displayOfSensitiveMedia: "Nozik kontentni ko'rish"
 whenServerDisconnected: "server bilan aloqa uzilganda"
 disconnectedFromServer: "Server bilan ulanish uzulib qoldi"
 reload: "Yangilash"
@@ -340,15 +348,20 @@ connectService: "Ulash"
 disconnectService: "Uzish"
 enableLocalTimeline: "Mahalliy vaqt mintaqasini yoqing"
 enableGlobalTimeline: "Global vaqt mintaqasini yoqing"
+disablingTimelinesInfo: "Administratorlar va Moderatorlar har doim barcha vaqt jadvallariga kirish huquqiga ega bo'ladilar, hatto ular yoqilmagan bo'lsa ham."
 registration: "Ro'yxatdan o'tish"
 enableRegistration: "Ro'yxatdan o'tishni yoqing"
 invite: "Taklif qilish"
+driveCapacityPerLocalAccount: "Har bir mahalliy foydalanuvchi uchun disk maydoni"
+driveCapacityPerRemoteAccount: "Har bir masofaviy foydalanuvchi uchun disk maydoni"
 inMb: "Megabaytlarda"
-iconUrl: "Ikonkaning URL manzili (masalan: favicon)"
+bannerUrl: "Banner URLi"
 backgroundImageUrl: "Fon rasmi URL manzili"
 basicInfo: "Asosiy ma'lumot"
 pinnedUsers: "Qadalgan foydalanuvchilar"
+pinnedUsersDescription: "Har bir qatorga bitta foydalanuvchi nomini kiriting. Bu yerda sanab oʻtilgan foydalanuvchilar “Oʻrganish” yorligʻiga bogʻlanadi."
 pinnedPages: "Qadalgan Sahifalar"
+pinnedClipId: "Qadalgan xabar IDsi"
 pinnedNotes: "Qadalgan qayd"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptchani yoqish"
@@ -358,19 +371,37 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA ni yoqish"
 recaptchaSiteKey: "Sayt kaliti"
 recaptchaSecretKey: "Maxfiy kalit"
+turnstile: "Turniket"
+enableTurnstile: "Turniketni yoqish"
 turnstileSiteKey: "Sayt kaliti"
 turnstileSecretKey: "Maxfiy kalit"
+avoidMultiCaptchaConfirm: "\nBir nechta Captcha tizimlaridan foydalanish ular o'rtasida noqulaylik olib kelishi mumkin. Hozirda faol bo'lgan boshqa Captcha tizimlarini o'chirib qo'ymoqchimisiz? Agar siz ularning faol bo'lishini istasangiz, bekor qilish tugmasini bosing."
 antennas: "Antennalar"
 manageAntennas: "Antennalarni boshqarish"
 name: "Ism"
 antennaSource: "Antenna manbai"
 antennaKeywords: "Kalit so'zni qabul qilish"
+antennaExcludeKeywords: "Istisno qilingan kalit so'zlar"
+antennaKeywordsDescription: "VA sharti uchun bo'shliqlar bilan yoki YOKI sharti uchun qator uzilishlari bilan ajrating."
 notifyAntenna: "Yangi qaydlar haqida menga xabar bering"
+withFileAntenna: "Faqatgina fayli bor qaydlar"
+enableServiceworker: "Bildirish nomalarni olish"
+antennaUsersDescription: "Har bir foydalunvchi nomini alohida qatorga yozing"
+caseSensitive: "Katta-kichik harfni farqlash"
+withReplies: "Javob yo'llash"
 connectedTo: "Quyidagi akkountlarga ulangan"
-silence: "Sukunat"
+notesAndReplies: "Qaydlar va javoblar"
+withFiles: "Fayllar"
+silence: "Jim qilish"
+silenceConfirm: "Rostdan ham ushbu foydalanuvchini jim qilmoqchimisiz?"
+unsilence: "Jim qilishni bekor qilish"
+unsilenceConfirm: "Rostdan ham ushbu foydalanuvchini ovozsiz \nqilmoqchimisiz?"
 popularUsers: "Mashhur foydalanuvchilar."
+recentlyUpdatedUsers: "Yaqinda ro'yxatdan o'tgan foydalanuvchilar"
 recentlyRegisteredUsers: "Yaqinda ro'yxatdan o'tgan foydalanuvchilar"
+recentlyDiscoveredUsers: "Yangi foydalanuvchilar"
 exploreUsersCount: "{count} ta foydalanuvchi bor"
+exploreFediverse: "Fediversni ko'rib chiqing"
 popularTags: "Ommabop teglar"
 userList: "Ro'yxatlar"
 about: "Haqida"
@@ -381,12 +412,25 @@ token: "Tasdiqlash"
 totp: "Autentifikatsiya ilovasi"
 totpDescription: "Bir martalik parollarni kiritish uchun autentifikatsiya ilovasidan foydalaning"
 moderator: "Moderator"
+moderation: "Moderatsiya"
 nUsersMentioned: "{n} tomonidan chop etilgan"
+securityKeyAndPasskey: "Xavfsizlik kaliti va maxfiy so'z"
+securityKey: "Xavfsizlik kaliti"
+lastUsed: "Oxirgi marta foydalanilgan"
+lastUsedAt: "Oxirgi marta {t} da foydalanilgan"
+unregister: "ro'yxatdan chiqarish"
+passwordLessLogin: "Parolsiz kirshni sozlash"
+passwordLessLoginDescription: "Parolsiz kirish"
 resetPassword: "Parolni tiklash"
+newPasswordIs: "Yangi parolingiz {password}"
+reduceUiAnimation: "Interfeysdagi animatsiyani kamaytirish"
 share: "Yuborish"
 notFound: "Topilmadi"
+notFoundDescription: "Ushbu sahifa topilmadi"
 uploadFolder: "Jildni yuklash"
 cacheClear: "Keshni tozalash"
+markAsReadAllNotifications: "Bildirishnomalarni o'qilgan deb belgilash"
+markAsReadAllUnreadNotes: "Barch xabarlarni oq'ilgan deb belgilash"
 markAsReadAllTalkMessages: "Barcha suhbatlarni o'qilgan deb belgilang"
 help: "Yordam"
 inputMessageHere: "Xabar kiriting"
@@ -399,6 +443,11 @@ text: "Matn"
 enable: "Yoqish"
 next: "Keyingisi"
 retype: "Qayta kiriting"
+noteOf: "{user} tomonidan  joylandi\n"
+quoteAttached: "Iqtibos"
+quoteQuestion: "Iqtibos sifatida qo'shilsinmi?"
+noMessagesYet: "Bu yerda xabarlar yo'q"
+newMessageExists: "Yangi xabarlar bor"
 onlyOneFileCanBeAttached: "Faqat bitta faylni biriktirish mumkin"
 signinRequired: "Davom etishdan oldin ro'yhatdan o'tishingiz yoki tizimga kirishingiz kerak"
 invitations: "Taklif qilish"
@@ -418,10 +467,16 @@ signinWith: "{x} bilan tizimga kirish"
 signinFailed: "Tizimga kirishda xatolik yuz berdi. Iltimos, foydalanuvchi nomingiz va parolingizni tekshiring."
 or: "yoki"
 language: "til"
+uiLanguage: "Interfeys tili"
 aboutX: "{x} haqida"
+emojiStyle: "Emoji ko'rinishi"
+native: "Mahalliy"
+disableDrawer: "Slayd menyusidan foydalanmang"
 showNoteActionsOnlyHover: "Eslatma amallarini faqat sichqonchani olib borganda ko‘rsatish"
 noHistory: "Tarix yo'q"
 signinHistory: "kirish tarixi"
+enableAdvancedMfm: "MFMni faollashtirish"
+doing: "Bajarilmoqda..."
 category: "kategoriya"
 tags: "teg"
 docSource: "Ushbu hujjatning manbasi"
@@ -431,8 +486,10 @@ regenerate: "regeneratsiya"
 fontSize: "shrift hajmi"
 limitTo: "{x} gacha"
 noFollowRequests: "obuna uchun so'rov yo'q"
+openImageInNewTab: "Rasmni boshqa oynada ochish"
 dashboard: "Boshqaruv paneli"
 local: "Mahalliy"
+remote: "masofaviy"
 total: "Jami"
 weekOverWeekChanges: "Oxirgi haftadagi o'zgarishlar"
 dayOverDayChanges: "Kecha bo'lgan o'zgarishlar"
@@ -444,18 +501,56 @@ promote: "targ'ib qilish"
 numberOfDays: "kunlar soni"
 hideThisNote: "bu eslatmani yashiring"
 showFeaturedNotesInTimeline: "Tanlangan qaydlarni Timelineda ko'rsatish"
+objectStorage: "ob'ektni saqlash"
+useObjectStorage: "Ob'ektni saqlashdan foydalaning"
 objectStorageBaseUrl: "Asosiy URL"
+objectStorageBaseUrlDesc: "Malumot va foydalanish uchun URL. Agar siz CDN yoki proksi-serverdan foydalanayotgan bo'lsangiz, URL manzili, S3: 'https://<bucket>.s3.amazonaws.com', GCS va boshqalar: 'https://storage.googleapis.com/<bucket>'."
+objectStorageBucket: "Bucket"
+objectStorageBucketDesc: "Iltimos, foydalaniladigan xizmatning bucket nomini belgilang."
+objectStoragePrefix: "Prefix"
+objectStorageEndpoint: "Endpoint"
 objectStorageRegion: "Mintaqa"
+objectStorageRegionDesc: "'xx-east-1' kabi mintaqani belgilang. Agar xizmatingizda mintaqa tushunchasi bo'lmasa, `us-east-1` dan foydalaning. AWS konfiguratsiya fayllari yoki muhit oʻzgaruvchilariga havola qilishda boʻsh qoldiring."
 objectStorageUseSSL: "SSL dan foydalaning"
+objectStorageUseSSLDesc: "API ulanishlari uchun https dan foydalanmasangiz, belgini olib tashlang"
+objectStorageUseProxy: "Proksi-serverdan foydalaning"
+objectStorageUseProxyDesc: "Proksi-serverdan foydalanishni xohlamasangiz, uni o'chiring"
+objectStorageSetPublicRead: "Yuklashda \"public-read\" ni o'rnating"
+serverLogs: "Server protokoli"
+deleteAll: "Hammasini o'chirib tashlash"
+showFixedPostForm: "Taqdim etish shaklini vaqt jadvalining yuqori qismida ko'rsating"
+newNoteRecived: "Yangi qaydlar mavjud emas"
 sounds: "Tovushlar"
 sound: "ovoz"
+listen: "Eshitish"
 none: "Hechnima"
+showInPage: "Sahifada ko'rsatish"
+popout: "Oching"
 volume: "Ovoz balandligi"
 details: "Batafsil"
+chooseEmoji: "Emojini tanlang"
+unableToProcess: "Opertsiya bajarilmadi"
+recentUsed: "Oxirgi ishlatilganlar"
+install: "O‘rnatish"
+uninstall: "O‘chirib tashlash"
+installedApps: "O'rnatilgan ilovalar"
+nothing: "Hech narsa yo'q"
+installedDate: "O'rnatish sanasi"
+lastUsedDate: "Oxirgi marta ishlatilgan sana"
+state: "Holat"
+sort: "saralamoq"
+ascendingOrder: "O'sish bo'yicha"
+descendingOrder: "Kamayish bo'yicha"
+scratchpad: "Qoralama"
 output: "Chiqish"
+script: "Skript"
+disablePagesScript: "AiScriptni sahifalardan o'chirish"
+updateRemoteUser: "Masofaviy foydalanuvchi ma'lumotlarini yangilash"
 deleteAllFiles: "barcha fayllarni o'chirish"
 deleteAllFilesConfirm: "Barcha fayllar oʻchirilsinmi?"
+removeAllFollowing: "Barcha obunalarni o'chirish"
 userSuspended: "Bu foydalanuvchi muzlatilgan."
+userSilenced: "Ushbu foydalanuvchi jim qilingan"
 yourAccountSuspendedTitle: "akkaunt muzlatilgan"
 yourAccountSuspendedDescription: "Ushbu akkaunt serverning xizmat ko'rsatish shartlarini buzish kabi sabablarga ko'ra to'xtatilgan. Tafsilotlar uchun administratoringizga murojaat qiling. Iltimos, yangi akkaunt yaratmang."
 tokenRevoked: "token yaroqsiz"
@@ -465,51 +560,305 @@ accountDeletedDescription: "Bu akkaunt oʻchirildi."
 menu: "Menyu"
 divider: "Ajratrmoq"
 addItem: "Element qo'shish"
+rearrange: "Qayta saralash"
+inboxUrl: "Qabul qilingan xabarlar URL manzili"
 serviceworkerInfo: "bildirishnomalar uchun yoqilgan bo'lishi kerak."
 deletedNote: "Oʻchirilgan post"
+visibility: "Ko'rinishi"
+poll: "So'ro'vnoma"
+useCw: "Kontentni yashirish"
+enablePlayer: "Video pleyerni ochish"
+disablePlayer: "Video pleyerni yopish"
+expandTweet: "Xabarni kengaytirish"
 themeEditor: "Rang sxemasi muharriri"
+description: "tavsif"
 describeFile: "sarlavha qo'shing"
 enterFileDescription: "sarlavha kiriting"
 author: "muallif"
 leaveConfirm: "Sizda saqlanmagan oʻzgarishlar bor. Bekor qilinsinmi?"
+manage: "Administratsiya"
+plugins: "Kengaytmalar, plaginlar"
+preferencesBackups: "Sozlamalarni zahiralash"
 useBlurEffectForModal: "Modal uchun xiralashtirish effektidan foydalaning"
+useFullReactionPicker: "Katta oynada reaksiya tanlash"
 width: "kengligi"
 height: "balandligi"
 large: "Katta"
+medium: "O'rta"
 small: "kichik"
+generateAccessToken: "Kirish tokenini yaratish"
+permission: "Ruxsatlar"
 enableAll: "Yoqish"
 disableAll: "hammasini o'chirib qo'ying"
+tokenRequested: "Hisobga kirish"
+pluginTokenRequestedDescription: "Bu plagin shu yerda belgilanganlarga qodir bo'ladi"
+notificationType: "Bildirishnoma turi"
 edit: "Tahrirlash"
+emailServer: "Email server"
 email: "Email"
+emailAddress: "E-pochtangiz:"
+smtpConfig: "SMTP server sozlamalari"
 smtpHost: "Host"
+smtpPort: "Port"
 smtpUser: "Foydalanuvchi nomi"
 smtpPass: "Parol"
+testEmail: "Email jo'natmani testlash"
+userSaysSomething: "{name} nimadir dedi"
+makeActive: "Faol"
+display: "Displey"
 copy: "Nusxa olish"
+metrics: "Metrikalar"
+overview: "Umumiy ma'lumot"
+logs: "Jurnallar"
+delayed: "Kechiktirildi"
+database: "Ma'lumotlar bazasi"
+channel: "Kanallar"
+create: "Yaratish"
 notificationSetting: "Bildirishnoma sozlamalari"
+notificationSettingDesc: "Ko'rsatish uchun bildirishnoma turlarini tanlang."
+useGlobalSetting: "Global sozlamalardan foydalanish"
 other: "Qo‘shimcha"
+regenerateLoginToken: "Kirish tokenini qayta yaratish"
+setMultipleBySeparatingWithSpace: "Bo'sh joy qoldirib, bir necha ma'lumot kiritish mumkin"
+fileIdOrUrl: "Fayl ID'si yoki URL havolasi"
 behavior: "Hatti-harakatlar"
 sample: "Namuna"
+abuseReports: "Shikoyatlar"
+reportAbuse: "Shikoyat qilish"
+reportAbuseOf: "{name} ustidan shikoyat qilish"
+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"
+editTheseSettingsMayBreakAccount: "Bu sozlamalarni o'zgartirish hisobingizga zarar yetkazishi mumkin."
+waitingFor: "{x}ni kutayapman"
+random: "Tasodifiy"
+system: "Tizim"
+switchUi: "Interfeysni almashtirish"
+desktop: "Brauzer rejimi"
+clip: "Klip"
+createNew: "Yangi yaratish"
+optional: "Ixtiyoriy"
+createNewClip: "Yangi klip yaratish"
+unclip: "qirqish\n"
+confirmToUnclipAlreadyClippedNote: "Ushbu xat allaqachon \"{name}\" klipga tegishli. Uni ushbu klipdan olib tashlashni xohlaysizmi?"
 public: "Ommaviy"
+i18nInfo: "Misskey bir qancha volontyorlar yordamida bir qancha tillarga tarjima qilingan. Ushbu {link} orqali ularga yordam berishingiz mumkin."
+manageAccessTokens: "Kirish tokenlarini boshqarish"
+accountInfo: "Akkount haqida ma'lumot"
+notesCount: "Xatlar soni"
+repliesCount: "Yuborilgan javoblar soni"
+renotesCount: "Qayta yuborilgan xatlar soni"
+repliedCount: "Qabul qilingan javoblar soni"
+renotedCount: "Qayta yuborilgan xatlar soni"
+followingCount: "Obuna bo'lingan akkountlar soni"
+followersCount: "Obunachilar soni"
+sentReactionsCount: "Yuborilgan reaksiyalar soni"
+receivedReactionsCount: "Qabul qilingan reaksiyalar soni"
+pollVotesCount: "Berilgan ovozlar soni"
+pollVotedCount: "Qabul qilingan ovozlar soni"
+yes: "Ha"
+no: "Yo'q"
+driveFilesCount: "Diskdagi fayllar soni"
+driveUsage: "Ishlatilgan disk joyi"
+noCrawleDescription: "Qidiruv tizimlari sizning profilingiz, sahifalaringiz, xatlaringiz va hokazolarni belgilamasligi uchun so'rov yuborish"
+lockedAccountInfo: "Xatlaringizni faqatgina obunachilaringizga ko'rsatishni xohlasangiz unda \"Faqat Obunachilar uchun\" xususiyatini yoqishingiz lozim. Bo'lmasa sizning yozgan xatlaringiz hammaga ko'rinadi."
+alwaysMarkSensitive: "Avvaldan ta'sirchan kontent deb belgilash"
+loadRawImages: "Thumbnaillarsiz Original rasmni yuklash"
+disableShowingAnimatedImages: "Animatsiyali rasmlarni ko'rsatmaslik"
+verificationEmailSent: "Emailingizga tasdiqlash xabari yuborildi. Iltimos linkda ko'rsatilgan amallarga rioya qiling"
+notSet: "Sozlanmagan"
+emailVerified: "Elektron pochta manzili tasdiqlandi"
+pageLikesCount: "Sahifadagi like'lar soni"
+contact: "aloqa uchun manzil"
+useSystemFont: "Tizimdagi standart shriftidan foydalaning"
+clips: "Klip"
+experimentalFeatures: "eksperimental xususiyatlar"
+experimental: "eksperimental"
+developer: "Dasturchi"
+makeExplorable: "Akkauntingizni topishni osonlashtiring"
+duplicate: "Dublikat"
+left: "Chap(dagi)"
+center: "Markaz"
+wide: "Keng"
+narrow: "Tor"
+reloadToApplySetting: "Bu sozlamalar sahifa yangilangandagina kuchga kiradi. Hozir yangilashni istaysizmi?"
+needReloadToApply: "Sahifani yangilash talab etiladi."
 clearCache: "Keshni tozalash"
 onlineUsersCount: "Faol userlar"
+nUsers: "{n} ta foydalanuvchi"
 myTheme: "Mening rang sxemam"
 backgroundColor: "Fon"
 accentColor: "Urg'u"
 textColor: "Matn"
+saveAs: "Boshqacha saqlash"
+advanced: "Murakkab"
+advancedSettings: "Qo'shimcha sozlashlar"
+value: "Qiymati"
+createdAt: "Yaratilish vaqti"
+updatedAt: "yangilangan sana"
+saveConfirm: "O'zgartirishni saqlash?"
+deleteConfirm: "o'chirishni tasdiqlash"
+invalidValue: "noto'g'ri qiymat"
+registry: "ro'yhatga olish"
+closeAccount: "hisobni yopish / profilni yopish"
+currentVersion: "joriy versiya"
+latestVersion: "so'ngi versiya"
+youAreRunningUpToDateClient: "siz so'ngi versiyali ilovani ishlatyapsiz"
+newVersionOfClientAvailable: "Mijozning yangi versiyasi mavjud."
+usageAmount: "foydalanish miqdori"
+capacity: "sig'im"
+inUse: "allaqachon band"
+editCode: "kodni tahrirlash"
+apply: "Ilova"
+receiveAnnouncementFromInstance: "Serverdan bildirishnomalarni oling"
+emailNotification: "E-mail xabarlari"
+publish: "Chiqarish"
+inChannelSearch: "Kanal qidirish"
+useReactionPickerForContextMenu: "kontekst menyusi uchun reaktsiya tanlash vositasidan foydalaning"
+typingUsers: "{users} yozmoqda"
+jumpToSpecifiedDate: "Muayyan sanaga o'tish"
+showingPastTimeline: "O'tgan vaqt jadvallarini ko'rsatish"
+clear: "aniq"
+markAllAsRead: "hammasini o'qilgan deb belgilang"
+goBack: "qaytish"
+unlikeConfirm: "Un like qilishni xohlaysizmi?"
+fullView: "to'liq ko'rish"
+quitFullView: "Toʻliq koʻrishdan chiqish"
+addDescription: "Tavsif qo'shing"
 info: "Haqida"
+userInfo: "Foydalanuvchi ma'lumotlari"
+unknown: "aniq emas"
+onlineStatus: "onlayn holat"
+hideOnlineStatus: "onlayn holatni yashirish"
+hideOnlineStatusDescription: "Onlayn statusingizni yashirish, qidiruv kabi baʼzi funksiyalardan foydalanish imkoniyatini kamaytirishi mumkin."
+online: "onlayn"
+active: "Aktiv"
+offline: "oflayn"
+notRecommended: "tavsiya etilmaydi"
+selectAccount: "Akkauntni tanlang"
+switchAccount: "akkauntni almashtirish"
+enabled: "yaroqli"
+disabled: "yaroqsiz"
+quickAction: "tezkor harakat"
 user: "Foydalanuvchilar"
+administration: "Administratsiya"
+accounts: "akkaunt"
+switch: "almashtirish"
+noBotProtectionWarning: "Bot himoyasi sozlanmagan."
+configure: "sozlamoq"
+postToGallery: "Yangi galleriya posti"
+gallery: "Galereya"
+recentPosts: "So'nggi postlar"
+popularPosts: "Mashhur postlar"
+shareWithNote: "Eslatmani ulashish"
+ads: "Reklama"
+startingperiod: "Boshlanish davri"
+memo: "Eslatma"
+priority: "Ustuvorlik"
+high: "Yuqori"
+middle: "O'rta"
+low: "Quyi"
+ratio: "nisbat"
+previewNoteText: "Razm solish"
+customCss: "Maxsus CSS"
 global: "Global"
 squareAvatars: "Kvadrat avatarkalar"
+sent: "Yuborish"
+received: "Qabul qilingan"
+searchResult: "Qidiruv natijalari"
+hashtags: "Hashteglar"
+troubleshooting: "Muammolarni bartaraf qilish"
+useBlurEffect: "Interfeysda xiralashtiruvchi effektlardan foydalanish"
+learnMore: "Batafsilroq"
+misskeyUpdated: "Misskey yangilandi!"
+whatIsNew: "O'zgarishlarni ko'rish"
+translate: "Tarjima qilish"
+translatedFrom: "{x} tilidan tarjima qilindi"
+devMode: "Dasturchi rejimi"
+lastCommunication: "Oxirgi muloqot"
+resolved: "Hal qilingan"
+unresolved: "Hal qilinmagan"
+breakFollow: "Obunachini o'chirish"
+breakFollowConfirm: "Obunachini o'chirmoqchimisiz?"
+itsOn: "Yoqilgan"
+itsOff: "O'chirilgan"
+on: "Yoqish"
+off: "O'chirish"
+emailRequiredForSignup: "Ro'yxatdan o'tish uchun email talab qilish"
+unread: "Oʻqilmagan xabarlar"
+filter: "Filter"
+controlPanel: "Boshqaruv paneli"
+manageAccounts: "Hisobni boshqarish"
+classic: "Klassik"
+hide: "Yashirish"
 searchByGoogle: "Izlash"
 indefinitely: "Hech qachon"
 file: "Fayllar"
+recommended: "Tavsiya qilingan"
+check: "Tekshirish"
+requireAdminForView: "Ko'rish uchun adminstrator hisobi bilan tizimga kirgan bo'lishingiz kerak."
+isSystemAccount: "Ushbu hisob tizim tomonidan avtomatik tarzda yaratilgan va boshqariladi."
+typeToConfirm: "Ushbu amalni bajarish uchun {x}ni kiriting"
+deleteAccount: "Hisobni o'chirish"
+document: "hujjat"
+numberOfPageCache: "Sahifa keshlar soni"
+logoutConfirm: "Chiqishni xohlaysizmi?"
+lastActiveDate: "oxirgi foydalanish sanasi"
+statusbar: "Holat paneli"
+pleaseSelect: "Iltimos tanlang"
+reverse: "Teskari"
+colored: "rangli"
+refreshInterval: "yangilash oralig'i"
 label: "Yorliq"
+type: "turi"
+speed: "tezlik"
+slow: "Sekin"
+fast: "Tez"
+localOnly: "Faqat mahalliy"
+remoteOnly: "faqat masofadan turib"
+failedToUpload: "yuklanmadi"
+cannotUploadBecauseInappropriate: "Faylni yuklab bo'lmaydi, chunki unda nomaqbul kontent borligi aniqlangan."
+cannotUploadBecauseNoFreeSpace: "Yuklab bo'lmadi, chunki diskda bo'sh joy yo'q."
+cannotUploadBecauseExceedsFileSizeLimit: "Faylni yuklash mumkin emas, chunki u fayl hajmi chegarasidan oshib ketgan."
+beta: "beta"
+account: "akkaunt"
+show: "Displey"
 color: "Rang"
+disableFederationConfirm: "Federatsiyani o'chirmoqchimisiz?"
+disableFederationOk: "O'chirish"
+emailNotSupported: "Bu server E-pochtalar yuborishni qo'llab-quvvatlamaydi"
+postToTheChannel: "Kanalga joylash"
+cannotBeChangedLater: "Buni keyinchalik o'zgartirishni iloji yo'q"
+likeOnly: "Faqat like'lar"
+nonSensitiveOnly: "Xavfsiz rejim"
+rolesAssignedToMe: "Mening rollarim"
+resetPasswordConfirm: "Qayta parol o'rnatmoqchimisiz?"
+sensitiveWords: "Ta'sirchan so'zlar"
+icon: "Avatar"
+replies: "Javob berish"
+renotes: "Qayta qayd etish"
 _achievements:
   _types:
     _viewInstanceChart:
       title: "Tahlilchi"
+_role:
+  priority: "Ustuvorlik"
+  _priority:
+    low: "Quyi"
+    middle: "O'rta"
+    high: "Yuqori"
+_ffVisibility:
+  public: "Chiqarish"
 _ad:
+  back: "qaytish"
   hide: "Boshqa ko'rsatilmasin"
 _email:
   _follow:
@@ -566,6 +915,7 @@ _ago:
   minutesAgo: "{n} daqiqa oldin"
   hoursAgo: "{n} soat oldin"
   daysAgo: "{n} kun oldin"
+  invalid: "Hech narsa yo'q"
 _2fa:
   renewTOTPCancel: "Hozir emas"
 _permissions:

locales/vi-VN.yml

@@ -1,5 +1,5 @@
 ---
-_lang_: "Tiếng Việt"
+_lang_: "Tiếng Nhật"
 headlineMisskey: "Mạng xã hội liên hợp"
 introMisskey: "Xin chào! Misskey là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀"
 poweredByMisskeyDescription: "{name} là một trong những chủ máy của <b>Misskey</b> là nền tảng mã nguồn mở"
@@ -20,6 +20,7 @@ noNotes: "Chưa có bài viết nào."
 noNotifications: "Chưa có thông báo"
 instance: "Máy chủ"
 settings: "Cài đặt"
+notificationSettings: "Cài đặt thông báo"
 basicSettings: "Thiết lập chung"
 otherSettings: "Thiết lập khác"
 openInWindow: "Mở trong cửa sổ mới"
@@ -44,13 +45,20 @@ pin: "Ghim"
 unpin: "Bỏ ghim"
 copyContent: "Chép nội dung"
 copyLink: "Chép liên kết"
+copyLinkRenote: "Sao chép liên kết ghi chú"
 delete: "Xóa"
 deleteAndEdit: "Sửa"
 deleteAndEditConfirm: "Bạn có chắc muốn sửa tút này? Những biểu cảm, lượt trả lời và đăng lại sẽ bị mất."
 addToList: "Thêm vào danh sách"
+addToAntenna: "Thêm vào Ăngten"
 sendMessage: "Gửi tin nhắn"
 copyRSS: "Sao chép RSS"
 copyUsername: "Chép tên người dùng"
+copyUserId: "Sao chép ID người dùng"
+copyNoteId: "Sao chép ID ghi chú"
+copyFileId: "Sao chép ID tập tin"
+copyFolderId: "Sao chép ID thư mục"
+copyProfileUrl: "Sao chép URL hồ sơ"
 searchUser: "Tìm kiếm người dùng"
 reply: "Trả lời"
 loadMore: "Tải thêm"
@@ -122,6 +130,8 @@ unmarkAsSensitive: "Bỏ đánh dấu nhạy cảm"
 enterFileName: "Nhập tên tập tin"
 mute: "Ẩn"
 unmute: "Bỏ ẩn"
+renoteMute: "Mute Renotes"
+renoteUnmute: "Unmute Renotes"
 block: "Chặn"
 unblock: "Bỏ chặn"
 suspend: "Vô hiệu hóa"
@@ -131,8 +141,10 @@ unblockConfirm: "Bạn có chắc muốn bỏ chặn người này?"
 suspendConfirm: "Bạn có chắc muốn vô hiệu hóa người này?"
 unsuspendConfirm: "Bạn có chắc muốn bỏ vô hiệu hóa người này?"
 selectList: "Chọn danh sách"
+editList: "Chỉnh sửa danh sách"
 selectChannel: "Lựa chọn kênh"
 selectAntenna: "Chọn một antenna"
+editAntenna: "Chỉnh sửa Ăngten"
 selectWidget: "Chọn tiện ích"
 editWidgets: "Sửa tiện ích"
 editWidgetsExit: "Xong"
@@ -145,6 +157,9 @@ addEmoji: "Thêm emoji"
 settingGuide: "Cài đặt đề xuất"
 cacheRemoteFiles: "Tập tin cache từ xa"
 cacheRemoteFilesDescription: "Khi tùy chọn này bị tắt, các tập tin từ xa sẽ được tải trực tiếp từ máy chủ khác. Điều này sẽ giúp giảm dung lượng lưu trữ nhưng lại tăng lưu lượng truy cập, vì hình thu nhỏ sẽ không được tạo."
+youCanCleanRemoteFilesCache: "Bạn có thể xoá bộ nhớ đệm bằng cách nhấn vào nút🗑️ở trong phần quản lý tệp."
+cacheRemoteSensitiveFiles: "Lưu các tập tin nhạy cảm vào bộ nhớ tạm từ xa"
+cacheRemoteSensitiveFilesDescription: "Khi bạn tắt tính năng này, các tệp nhạy cảm sẽ được tải trực tiếp từ máy chủ và không được lưu vào bộ nhớ tạm"
 flagAsBot: "Đánh dấu đây là tài khoản bot"
 flagAsBotDescription: "Bật tùy chọn này nếu tài khoản này được kiểm soát bởi một chương trình. Nếu được bật, nó sẽ được đánh dấu để các nhà phát triển khác ngăn chặn chuỗi tương tác vô tận với các bot khác và điều chỉnh hệ thống nội bộ của Misskey để coi tài khoản này như một bot."
 flagAsCat: "Chế độ Mèeeeeeeeeeo!!"
@@ -153,6 +168,7 @@ flagShowTimelineReplies: "Hiện lượt trả lời trong bảng tin"
 flagShowTimelineRepliesDescription: "Hiện lượt trả lời của người bạn theo dõi trên tút của những người khác."
 autoAcceptFollowed: "Tự động phê duyệt theo dõi từ những người mà bạn đang theo dõi"
 addAccount: "Thêm tài khoản"
+reloadAccountsList: "Cập nhật danh sách tài khoản"
 loginFailed: "Đăng nhập không thành công"
 showOnRemote: "Truy cập trang của người này"
 general: "Tổng quan"
@@ -259,8 +275,10 @@ noMoreHistory: "Không còn gì để đọc"
 startMessaging: "Bắt đầu trò chuyện"
 nUsersRead: "đọc bởi {n}"
 agreeTo: "Tôi đồng ý {0}"
+agree: "Đồng ý"
 agreeBelow: "Đồng ý với nội dung dưới đây"
 basicNotesBeforeCreateAccount: "Những điều cơ bản cần chú ý "
+termsOfService: "Điều khoản và Điều kiện"
 start: "Bắt đầu"
 home: "Trang chính"
 remoteUserCaution: "Vì người dùng này ở máy chủ khác, thông tin hiển thị có thể không đầy đủ."
@@ -303,6 +321,7 @@ copyUrl: "Sao chép URL"
 rename: "Đổi tên"
 avatar: "Ảnh đại diện"
 banner: "Ảnh bìa"
+displayOfSensitiveMedia: "Hiển thị nội dung nhạy cảm (NSFW)"
 whenServerDisconnected: "Khi mất kết nối tới máy chủ"
 disconnectedFromServer: "Mất kết nối tới máy chủ"
 reload: "Tải lại"
@@ -337,7 +356,6 @@ invite: "Mời"
 driveCapacityPerLocalAccount: "Dung lượng ổ đĩa tối đa cho mỗi người dùng"
 driveCapacityPerRemoteAccount: "Dung lượng ổ đĩa tối đa cho mỗi người dùng từ xa"
 inMb: "Tính bằng MB"
-iconUrl: "URL Icon"
 bannerUrl: "URL Ảnh bìa"
 backgroundImageUrl: "URL Ảnh nền"
 basicInfo: "Thông tin cơ bản"
@@ -393,10 +411,13 @@ aboutMisskey: "Về Misskey"
 administrator: "Quản trị viên"
 token: "Token"
 2fa: "Xác thực 2 yếu tố"
+setupOf2fa: "Thiết lập xác thực 2 yếu tố"
 totp: "Ứng dụng xác thực"
 totpDescription: "Nhắn mã OTP bằng ứng dụng xác thực"
 moderator: "Kiểm duyệt viên"
 moderation: "Kiểm duyệt"
+moderationNote: "Ghi chú kiểm duyệt"
+addModerationNote: "Thêm ghi chú kiểm duyệt"
 nUsersMentioned: "Dùng bởi {n} người"
 securityKeyAndPasskey: "Mã bảo mật・Passkey"
 securityKey: "Khóa bảo mật"
@@ -456,6 +477,7 @@ aboutX: "Giới thiệu {x}"
 emojiStyle: "Kiểu cách Emoji"
 native: "Bản xứ"
 disableDrawer: "Không dùng menu thanh bên"
+showNoteActionsOnlyHover: "Chỉ hiển thị các hành động ghi chú khi di chuột"
 noHistory: "Không có dữ liệu"
 signinHistory: "Lịch sử đăng nhập"
 enableAdvancedMfm: "Xem bài MFM chất lượng cao."
@@ -468,6 +490,7 @@ createAccount: "Tạo tài khoản"
 existingAccount: "Tài khoản hiện có"
 regenerate: "Tạo lại"
 fontSize: "Cỡ chữ"
+limitTo: "Giới hạn tỷ lệ {x}"
 noFollowRequests: "Bạn không có yêu cầu theo dõi nào"
 openImageInNewTab: "Mở ảnh trong tab mới"
 dashboard: "Trang chính"
@@ -504,6 +527,7 @@ objectStorageSetPublicRead: "Đặt \"public-read\" khi tải lên"
 serverLogs: "Nhật ký máy chủ"
 deleteAll: "Xóa tất cả"
 showFixedPostForm: "Hiện khung soạn tút ở phía trên bảng tin"
+showFixedPostFormInChannel: "Hiển thị mẫu bài đăng ở phía trên bản tin"
 newNoteRecived: "Đã nhận tút mới"
 sounds: "Âm thanh"
 sound: "Âm thanh"
@@ -541,9 +565,14 @@ userSuspended: "Người này đã bị vô hiệu hóa."
 userSilenced: "Người này đã bị ẩn"
 yourAccountSuspendedTitle: "Tài khoản bị vô hiệu hóa"
 yourAccountSuspendedDescription: "Tài khoản này đã bị vô hiệu hóa do vi phạm quy tắc máy chủ hoặc điều tương tự. Liên hệ với quản trị viên nếu bạn muốn biết lý do chi tiết hơn. Vui lòng không tạo tài khoản mới."
+tokenRevoked: "Token đã bị từ chối"
+tokenRevokedDescription: "Phiên đăng nhập đã hết hạn. Vui lòng đăng nhập lại."
+accountDeleted: "Tài khoản đã bị xóa"
+accountDeletedDescription: "Tài khoản này đã bị xóa."
 menu: "Menu"
 divider: "Phân chia"
 addItem: "Thêm mục"
+rearrange: "Sắp xếp lại"
 relays: "Chuyển tiếp"
 addRelay: "Thêm chuyển tiếp"
 inboxUrl: "URL Hộp thư đến"
@@ -653,6 +682,7 @@ createNewClip: "Tạo một ghim mới"
 unclip: "Bỏ ghim"
 confirmToUnclipAlreadyClippedNote: "Bài đăng này là một phần của \"{name}\" ghim. Bạn có muốn bỏ khỏi ghim?"
 public: "Công khai"
+private: "Riêng tư"
 i18nInfo: "Misskey đang được các tình nguyện viên dịch sang nhiều thứ tiếng khác nhau. Bạn có thể hỗ trợ tại {link}."
 manageAccessTokens: "Tạo mã truy cập"
 accountInfo: "Thông tin tài khoản"
@@ -687,6 +717,8 @@ contact: "Liên hệ"
 useSystemFont: "Dùng phông chữ mặc định của hệ thống"
 clips: "Lưu bài viết"
 experimentalFeatures: "Tính năng thử nghiệm"
+experimental: "Thử nghiệm"
+thisIsExperimentalFeature: "Tính năng này đang trong quá trình thử nghiệm. Tính năng có thể không hoạt động, hoặc đặc tính kỹ thuật có thể bị thay đổi sau này."
 developer: "Nhà phát triển"
 makeExplorable: "Không hiện tôi trong \"Khám phá\""
 makeExplorableDescription: "Nếu bạn tắt, tài khoản của bạn sẽ không hiện trong mục \"Khám phá\"."
@@ -771,6 +803,7 @@ noMaintainerInformationWarning: "Chưa thiết lập thông tin vận hành."
 noBotProtectionWarning: "Bảo vệ Bot chưa thiết lập."
 configure: "Thiết lập"
 postToGallery: "Tạo tút có ảnh"
+postToHashtag: "Đăng bài với hashtag này"
 gallery: "Thư viện ảnh"
 recentPosts: "Tút gần đây"
 popularPosts: "Tút được xem nhiều nhất"
@@ -804,6 +837,7 @@ translatedFrom: "Dịch từ {x}"
 accountDeletionInProgress: "Đang xử lý việc xóa tài khoản"
 usernameInfo: "Bạn có thể sử dụng chữ cái (a ~ z, A ~ Z), chữ số (0 ~ 9) hoặc dấu gạch dưới (_). Tên người dùng không thể thay đổi sau này."
 aiChanMode: "Chế độ Ai"
+devMode: "Chế độ dành cho nhà phát triển"
 keepCw: "Giữ cảnh báo nội dung"
 pubSub: "Tài khoản Chính/Phụ"
 lastCommunication: "Lần giao tiếp cuối"
@@ -813,6 +847,8 @@ breakFollow: "Xóa người theo dõi"
 breakFollowConfirm: "Bạn bỏ theo dõi tài khoản này không?"
 itsOn: "Đã bật"
 itsOff: "Đã tắt"
+on: "Bật"
+off: "Tắt"
 emailRequiredForSignup: "Yêu cầu địa chỉ email khi đăng ký"
 unread: "Chưa đọc"
 filter: "Bộ lọc"
@@ -857,6 +893,7 @@ failedToFetchAccountInformation: "Không thể lấy thông tin tài khoản"
 rateLimitExceeded: "Giới hạn quá mức"
 cropImage: "Cắt hình ảnh"
 cropImageAsk: "Bạn có muốn cắt ảnh này?"
+cropYes: "Cắt"
 cropNo: "Để nguyên"
 file: "Tập tin"
 recentNHours: "{n}h trước"
@@ -892,6 +929,7 @@ remoteOnly: "Chỉ máy chủ từ xa"
 failedToUpload: "Tải lên thất bại"
 cannotUploadBecauseInappropriate: "Không thể tải lên tập tin này vì các phần của tập tin đã được phát hiện có khả năng là NSFW."
 cannotUploadBecauseNoFreeSpace: "Tải lên không thành công do thiếu dung lượng Drive."
+cannotUploadBecauseExceedsFileSizeLimit: "Không thể tải lên tập tin vì kích thước quá lớn."
 beta: "Beta"
 enableAutoSensitive: "Tự động đánh dấu NSFW"
 enableAutoSensitiveDescription: "Cho phép tự động phát hiện và đánh dấu media NSFW thông qua học máy, nếu có thể. Ngay cả khi tùy chọn này bị tắt, nó vẫn có thể được bật trên toàn máy chủ."
@@ -904,9 +942,11 @@ pushNotification: "Thông báo đẩy"
 subscribePushNotification: "Bật thông báo đẩy"
 unsubscribePushNotification: "Tắt thông báo đẩy"
 pushNotificationAlreadySubscribed: "Đang bật thông báo đẩy"
+pushNotificationNotSupported: "Trình duyệt của bạn không hỗ trợ thông báo đẩy."
 sendPushNotificationReadMessage: "Xóa thông báo đẩy sau khi đọc thông báo hay tin nhắn"
 sendPushNotificationReadMessageCaption: "Thông báo như {emptyPushNotificationMessage} sẽ hiển thị trong giây phút. Tiêu tốn pin của máy bạn có thể tăng lên hơn nữa."
 windowMaximize: "Phóng to"
+windowMinimize: "Thu nhỏ tối đa"
 windowRestore: "Khôi phục"
 caption: "Mô tả"
 loggedInAsBot: "Đang đăng nhập bằng tài khoản Bot"
@@ -923,12 +963,22 @@ didYouLikeMisskey: "Bạn có ưa thích Mískey không?"
 pleaseDonate: "Misskey là phần mềm miễn phí mà {host} đang sử dụng. Xin mong bạn quyên góp cho chúng tôi để chúng tôi có thể tiếp tục phát triển dịch vụ này. Xin cảm ơn!!"
 roles: "Vai trò"
 role: "Vai trò"
+noRole: "Bạn chưa được cấp quyền."
 normalUser: "Người dùng bình thường"
 undefined: "Chưa xác định"
+assign: "Phân công"
+unassign: "Hủy phân công"
 color: "Màu sắc"
 manageCustomEmojis: "Quản lý CustomEmoji"
+youCannotCreateAnymore: "Bạn đã tới giới hạn tạo."
 cannotPerformTemporary: "Tạm thời không sử dụng được"
 cannotPerformTemporaryDescription: "Tạm thời không sử dụng được vì lần số điều kiện quá giới hạn. Thử lại sau mọt lát nữa."
+invalidParamError: "Lỗi tham số"
+invalidParamErrorDescription: "Có vấn đề với các tham số được request. Thông thường, đây là do bug, nhưng cũng có thể do bạn đã nhập vào quá nhiều ký tự."
+permissionDeniedError: "Thao tác bị từ chối"
+permissionDeniedErrorDescription: "Tài khoản này không có đủ quyền hạn để thực hiện thao tác này."
+preset: "Mẫu thiết lập"
+selectFromPresets: "Chọn từ mẫu"
 achievements: "Thành tích"
 gotInvalidResponseError: "Không nhận được trả lời chủ máy"
 gotInvalidResponseErrorDescription: "Chủ máy có lẻ ngừng hoạt động hoặc bảo trí. Thử lại sau một lát nữa. "
@@ -943,8 +993,71 @@ copyErrorInfo: "Sao chép thông tin lỗi"
 joinThisServer: "Đăng ký trên chủ máy này"
 exploreOtherServers: "Tìm chủ máy khác"
 letsLookAtTimeline: "Thử xem Timeline"
+emailNotSupported: "Máy chủ này không hỗ trợ gửi email"
+postToTheChannel: "Đăng lên kênh"
+cannotBeChangedLater: "Không thể thay đổi sau này."
+rolesAssignedToMe: "Vai trò được giao cho tôi"
+resetPasswordConfirm: "Bạn thực sự muốn đặt lại mật khẩu?"
+sensitiveWords: "Các từ nhạy cảm"
+license: "Giấy phép"
+unfavoriteConfirm: "Bạn thực sự muốn xoá khỏi mục yêu thích?"
+retryAllQueuesConfirmText: "Điều này sẽ tạm thời làm tăng mức độ tải của máy chủ."
+enableChartsForRemoteUser: "Tạo biểu đồ người dùng từ xa"
+video: "Video"
+videos: "Các video"
+dataSaver: "Tiết kiệm dung lượng"
+accountMigration: "Gộp chung tài khoản"
+accountMoved: "Người dùng này đã chuyển sang một tài khoản mới:"
+accountMovedShort: "Tài khoản này đã được gộp"
+operationForbidden: "Thao tác này không thể thực hiện"
+forceShowAds: "Luôn hiện quảng cáo"
+notificationDisplay: "Thông báo"
+leftTop: "Phía trên bên tráí"
+rightTop: "Phía trên bên phải"
+leftBottom: "Phía dưới bên trái"
+rightBottom: "Phía dưới bên phải"
+stackAxis: "Hướng chồng"
+vertical: "Dọc"
 horizontal: "Thanh bên"
+position: "Vị trí"
+serverRules: "Luật của máy chủ"
 youFollowing: "Đang theo dõi"
+later: "Để sau"
+goToMisskey: "Tới Misskey"
+installed: "Đã tải xuống"
+branding: "Thương hiệu"
+turnOffToImprovePerformance: "Tắt mục này có thể cải thiện hiệu năng."
+expirationDate: "Ngày hết hạn"
+noExpirationDate: "Vô thời hạn"
+waitingForMailAuth: "Đang chờ xác nhận email"
+unused: "Chưa được sử dụng"
+used: "Đã được sử dụng"
+expired: "Đã hết hạn"
+doYouAgree: "Đồng ý?"
+iHaveReadXCarefullyAndAgree: "Tôi đã đọc và đồng ý với \"x\"."
+dialog: "Hộp thoại"
+icon: "Ảnh đại diện"
+forYou: "Dành cho bạn"
+currentAnnouncements: "Thông báo hiện tại"
+pastAnnouncements: "Thông báo trước đó"
+youHaveUnreadAnnouncements: "Có thông báo chưa đọc."
+replies: "Trả lời"
+renotes: "Đăng lại"
+loadReplies: "Hiển thị các trả lời"
+pinnedList: "Các mục đã được ghim"
+keepScreenOn: "Giữ màn hình luôn bật"
+_announcement:
+  forExistingUsers: "Chỉ những người dùng đã tồn tại"
+  end: "Lưu trữ thông báo"
+  readConfirmTitle: "Đánh dấu là đã đọc?"
+  readConfirmText: "Điều này sẽ đánh dấu nội dung của \"{title}\" là đã đọc."
+_initialAccountSetting:
+  accountCreated: "Tài khoản của bạn đã được tạo thành công!"
+  letsStartAccountSetup: "Để bắt đầu, hãy cùng thiết lập tài khoản nhé."
+  letsFillYourProfile: "Đầu tiên, hãy thiết lập hồ sơ của bạn."
+  profileSetting: "Thiết lập hồ sơ"
+_accountMigration:
+  movedTo: "Tài khoản mới:"
 _achievements:
   earnedAt: "Ngày thu nhận"
   _types:
@@ -1104,6 +1217,7 @@ _achievements:
     _cookieClicked:
       flavor: "Bạn nhầm phầm mềm chứ?"
 _role:
+  assignTarget: "Phân công"
   priority: "Ưu tiên"
   _priority:
     low: "Thấp"
@@ -1346,15 +1460,25 @@ _time:
   minute: "phút"
   hour: "giờ"
   day: "ngày"
+_timelineTutorial:
+  step4_1: "Bạn có thể thêm \"Reaction\" vào ghi chú"
+  step4_2: "Khi thêm biểu cảm hãy nhấn dấu \"+\""
 _2fa:
   alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
+  registerTOTP: "Đăng ký ứng dụng xác thực"
   passwordToTOTP: "Nhắn mật mã"
   step1: "Trước tiên, hãy cài đặt một ứng dụng xác minh (chẳng hạn như {a} hoặc {b}) trên thiết bị của bạn."
   step2: "Sau đó, quét mã QR hiển thị trên màn hình này."
-  step2Url: "Bạn cũng có thể nhập URL này nếu sử dụng một chương trình máy tính:"
+  step2Click: "Quét mã QR trên ứng dụng xác thực (Authy, Google authenticator, v.v.)"
+  step3Title: "Nhập mã xác thực"
   step3: "Nhập mã token do ứng dụng của bạn cung cấp để hoàn tất thiết lập."
   step4: "Kể từ bây giờ, những lần đăng nhập trong tương lai sẽ yêu cầu mã token đăng nhập đó."
+  securityKeyNotSupported: "Trình duyệt của bạn không hỗ trợ khóa bảo mật"
+  registerTOTPBeforeKey: "Vui lòng thiết lập một ứng dụng xác thực để đăng ký khóa bảo mật hoặc mật khẩu."
   securityKeyInfo: "Bên cạnh xác minh bằng vân tay hoặc mã PIN, bạn cũng có thể thiết lập xác minh thông qua khóa bảo mật phần cứng hỗ trợ FIDO2 để bảo mật hơn nữa cho tài khoản của mình."
+  registerSecurityKey: "Tạo khóa bảo mật hoặc mã bảo mật"
+  securityKeyName: "Nhập tên khóa bảo mật"
+  tapSecurityKey: "Vui lòng làm theo hướng dẫn của trình duyệt để đăng ký mã bảo mật hoặc mã khóa"
   removeKey: "Xóa mã bảo mật"
   removeKeyConfirm: "Xóa bản sao lưu {name}?"
   renewTOTP: "Cài đặt lại ứng dụng xác thực"
@@ -1677,5 +1801,11 @@ _dialog:
   charactersExceeded: "Bạn nhắn quá giới hạn ký tự!! Hiện nay {current} / giới hạn {max}"
   charactersBelow: "Bạn nhắn quá ít tối thiểu ký tự!! Hiện nay {current} / Tối thiểu {min}"
 _webhookSettings:
+  createWebhook: "Tạo Webhook"
   name: "Tên"
+  secret: "Mã bí mật"
+  events: "Sự kiện Webhook"
   active: "Đã bật"
+  _events:
+    reaction: "Khi nhận được sự kiện"
+    mention: "Khi có người nhắc tới bạn"

locales/zh-CN.yml

@@ -15,7 +15,7 @@ gotIt: "我明白了"
 cancel: "取消"
 noThankYou: "不用，谢谢"
 enterUsername: "输入用户名"
-renotedBy: "由 {user} 转贴"
+renotedBy: "{user} 转发了"
 noNotes: "没有帖文"
 noNotifications: "无通知"
 instance: "服务器"
@@ -45,6 +45,7 @@ pin: "置顶"
 unpin: "取消置顶"
 copyContent: "复制内容"
 copyLink: "复制链接"
+copyLinkRenote: "复制转帖链接"
 delete: "删除"
 deleteAndEdit: "删除并编辑"
 deleteAndEditConfirm: "要删除此帖并再次编辑吗？对此帖的所有回应、转发和回复也将被删除。"
@@ -155,13 +156,14 @@ emojiUrl: "emoji 地址"
 addEmoji: "添加表情符号"
 settingGuide: "推荐配置"
 cacheRemoteFiles: "缓存远程文件"
-cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程服务器载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
+cacheRemoteFilesDescription: "启用此设定时，将在此服务器上缓存远程文件。虽然可以加快图片显示的速度，但是相对的会消耗大量的服务器存储空间。用户角色内的网盘容量决定了这个远程用户能在服务器上保留保留多少缓存。当超出了这个限制时，旧的文件将从缓存中被删除，成为链接。当禁用此设定时，则是从一开始就将远程文件保留为链接。此时推荐将 default.yml 的 proxyRemoteFiles 设置为 true 以优化缩略图生成及保护用户隐私。"
+youCanCleanRemoteFilesCache: "可以使用文件管理的🗑️按钮来删除所有的缓存。"
 cacheRemoteSensitiveFiles: "缓存远程敏感媒体文件"
 cacheRemoteSensitiveFilesDescription: "如果禁用这项设定，远程服务器的敏感媒体将不会被缓存，而是直接链接。"
 flagAsBot: "这是一个机器人账号"
 flagAsBotDescription: "如果此账户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让 Misskey 的内部系统将此账户识别为机器人。"
-flagAsCat: "将这个账户设定为一只猫"
+flagAsCat: "喵！！！！！！！！！！！！"
-flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
+flagAsCatDescription: "喵喵喵？？"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
 flagShowTimelineRepliesDescription: "启用时，时间线除了显示用户的帖子外，还会显示其他用户对帖子的回复。"
 autoAcceptFollowed: "自动允许来自我关注的用户对我的关注请求"
@@ -177,7 +179,7 @@ searchWith: "搜索:{q}"
 youHaveNoLists: "列表为空"
 followConfirm: "你确定要关注 {name} 吗？"
 proxyAccount: "代理账户"
-proxyAccountDescription: "代理账户是在某些情况下充当用户的远程关注者的账户。 例如，当一个用户列出一个远程用户时，如果没有人跟随该列出的用户，则该活动将不会传递到该服务器，因此将代之以代理账户。"
+proxyAccountDescription: "代理账户是在某些情况下替代用户进行远程关注用的账户。 例如说，当用户将一位远程用户放入一个列表中时，如果本地服务器上没有任何人关注这位远程用户，则这位远程用户的账户活动将不会被送到本地服务器上。作为替代，此时将使用代理账户进行关注。"
 host: "主机名"
 selectUser: "选择用户"
 recipient: "收件人"
@@ -211,7 +213,7 @@ clearQueueConfirmText: "未送达的帖子将不会投递。 通常，您不需
 clearCachedFiles: "清除缓存"
 clearCachedFilesConfirm: "确定要清除缓存文件？"
 blockedInstances: "被封锁的服务器"
-blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。"
+blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
 muteAndBlock: "屏蔽/拉黑"
 mutedUsers: "已屏蔽用户"
 blockedUsers: "已拉黑的用户"
@@ -354,7 +356,6 @@ invite: "邀请"
 driveCapacityPerLocalAccount: "每个用户的网盘容量"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
 inMb: "以兆字节(MegaByte)为单位"
-iconUrl: "图标 URL"
 bannerUrl: "横幅 URL"
 backgroundImageUrl: "背景图 URL"
 basicInfo: "基本信息"
@@ -410,10 +411,13 @@ aboutMisskey: "关于 Misskey"
 administrator: "管理员"
 token: "Token (令牌)"
 2fa: "双因素认证"
+setupOf2fa: "设置双因素认证"
 totp: "身份验证应用"
 totpDescription: "使用认证应用输入一次性密码。"
 moderator: "监察员"
 moderation: "管理"
+moderationNote: "管理笔记"
+addModerationNote: "添加管理笔记"
 nUsersMentioned: "{n} 被提到"
 securityKeyAndPasskey: "安全密钥或 Passkey"
 securityKey: "安全密钥"
@@ -507,13 +511,13 @@ showFeaturedNotesInTimeline: "在时间线上显示热门推荐"
 objectStorage: "对象存储"
 useObjectStorage: "使用对象存储"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "这里是用于引用的 URL，如果您正在使用 CDN 或反向代理，请指定其 URL，例如S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
+objectStorageBaseUrlDesc: "这里是用于参考的 URL，如果您正在使用 CDN 或反向代理，请指定其 URL，例如 S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
 objectStorageBucket: "存储桶"
 objectStorageBucketDesc: "请指定使用的对象存储服务的存储桶名称。"
 objectStoragePrefix: "前缀"
 objectStoragePrefixDesc: "文件将存储在此前缀的目录下。"
-objectStorageEndpoint: "Endpoint"
+objectStorageEndpoint: "端点"
-objectStorageEndpointDesc: "如果你使用 AWS S3 请留空。否则请根据你使用的服务商的说明来进行设置，指定 Endpoint 形式为“<host>”或“<host>:<port>”。"
+objectStorageEndpointDesc: "如果你使用 AWS S3 请留空。否则请根据你使用的服务商的说明来进行设置，指定端点形式为“<host>”或“<host>:<port>”。"
 objectStorageRegion: "可用区"
 objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如果您的对象存储服务没有可用区概念，请将其留空或填写“us-east-1”。如果引用 AWS 的配置文件或环境变量，则留空。"
 objectStorageUseSSL: "使用 SSL"
@@ -653,6 +657,7 @@ behavior: "行为"
 sample: "示例"
 abuseReports: "举报"
 reportAbuse: "举报"
+reportAbuseRenote: "举报转帖"
 reportAbuseOf: "举报 {name}"
 fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写 URL 地址。"
 abuseReported: "内容已发送。感谢您提交信息。"
@@ -680,6 +685,7 @@ createNewClip: "新建便签"
 unclip: "移除便签"
 confirmToUnclipAlreadyClippedNote: "本帖已包含在便签 \"{name}\" 里。您想要将本帖从该便签中移除吗？"
 public: "公开"
+private: "私密"
 i18nInfo: "Misskey 已经被志愿者们翻译成了各种语言。如果你也有兴趣，可以通过 {link} 帮助翻译。"
 manageAccessTokens: "管理 Access Tokens"
 accountInfo: "账户信息"
@@ -1018,7 +1024,7 @@ retryAllQueuesConfirmText: "可能会使服务器负荷在一定时间内增加"
 enableChartsForRemoteUser: "生成远程用户的图表"
 enableChartsForFederatedInstances: "生成远程服务器的图表"
 showClipButtonInNoteFooter: "在贴文下方显示便签按钮"
-largeNoteReactions: "使用大图标来显示回应"
+reactionsDisplaySize: "回应显示大小"
 noteIdOrUrl: "帖子 ID 或 URL"
 video: "视频"
 videos: "视频"
@@ -1094,6 +1100,28 @@ expired: "已过期"
 doYouAgree: "你同意吗？"
 beSureToReadThisAsItIsImportant: "请好好阅读，这真的很重要。"
 iHaveReadXCarefullyAndAgree: "我已经仔细阅读并同意了「{x}」的内容。"
+dialog: "对话框"
+icon: "头像"
+forYou: "您的"
+currentAnnouncements: "现在的公告"
+pastAnnouncements: "过去的公告"
+youHaveUnreadAnnouncements: "您有未读的公告"
+useSecurityKey: "请根据浏览器或设备的提示，使用安全密钥或通行密钥。"
+replies: "回复"
+renotes: "转发"
+loadReplies: "查看回复"
+loadConversation: "查看对话"
+pinnedList: "已置顶的列表"
+keepScreenOn: "保持设备屏幕开启"
+_announcement:
+  forExistingUsers: "仅限现有用户"
+  forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。"
+  needConfirmationToRead: "需要确认才能标记为已读"
+  needConfirmationToReadDescription: "若启用，则会在标记已读时会显示确认对话框。此外，它也会不受批量已读操作的影响。"
+  end: "结束公告"
+  tooManyActiveAnnouncementDescription: "若有大量活动公告，可能会造成用户体验可能下降。请考虑归档已完成的公告。"
+  readConfirmTitle: "标记为已读？"
+  readConfirmText: "阅读“{title}”的内容并将其标记为已读。"
 _initialAccountSetting:
   accountCreated: "账户创建完成了！"
   letsStartAccountSetup: "来进行帐户的初始设置吧。"
@@ -1111,6 +1139,13 @@ _initialAccountSetting:
   laterAreYouSure: "要稍后再进行初始设定吗？"
 _serverRules:
   description: "在新用户注册前显示服务器的简单规则。推荐显示服务条款的主要内容。"
+_serverSettings:
+  iconUrl: "图标 URL"
+  appIconDescription: "指定当 {host} 显示为 app 时的图标。"
+  appIconUsageExample: "例如：作为书签添加到 PWA 或手机主屏幕的时候"
+  appIconStyleRecommendation: "因为有可能会被裁切为圆形或者圆角矩形，建议使用边缘带有留白背景的图标。"
+  appIconResolutionMustBe: "分辨率必须为 {resolution}。"
+  manifestJsonOverride: "覆盖 mainfest.json"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
   moveFromSub: "为另一个账户建立别名"
@@ -1365,6 +1400,9 @@ _achievements:
       title: "Brain Diver"
       description: "发布了包含 Brain Diver 链接的帖子"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "过度测试"
+      description: "短时间内连续测试通知"
 _role:
   new: "创建角色"
   edit: "编辑角色"
@@ -1679,14 +1717,14 @@ _2fa:
   step1: "首先，在您的设备上安装验证应用，例如 {a} 或 {b}。"
   step2: "然后，扫描屏幕上显示的二维码。"
   step2Click: "通过点击二维码，您可以使用设备上安装的身份验证器应用程序或密钥环进行注册"
-  step2Url: "在桌面应用程序中输入以下 URL："
+  step2Uri: "如果使用桌面应用程序的话，请输入下面的 URI"
   step3Title: "输入验证码"
   step3: "输入您的应用提供的动态口令以完成设置。"
+  setupCompleted: "设置完成"
   step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
   securityKeyNotSupported: "您的浏览器不支持安全密钥。"
   registerTOTPBeforeKey: "要注册安全密钥或 Passkey，请先设置验证器应用程序。"
   securityKeyInfo: "注册兼容 WebAuthn 的密钥，例如支持 FIDO2 的硬件安全密钥、设备上的生物识别功能、PIN 码以及 Passkey 等。"
-  chromePasskeyNotSupported: "目前不支持 Chrome 的 Passkey。"
   registerSecurityKey: "注册安全密钥或 Passkey"
   securityKeyName: "输入密钥名称"
   tapSecurityKey: "请按照浏览器说明操作来注册安全密钥或 Passkey。"
@@ -1697,6 +1735,11 @@ _2fa:
   renewTOTPConfirm: "当前验证器应用程序的验证码将不再有效"
   renewTOTPOk: "重新配置"
   renewTOTPCancel: "不用，谢谢"
+  checkBackupCodesBeforeCloseThisWizard: "在关闭此窗口前，请确认下面的备用代码"
+  backupCodes: "备用代码"
+  backupCodesDescription: "如果无法使用认证应用，可以使用以下的备用代码来访问账户。请务必将这些代码保存在安全的地方。每个代码仅可使用一次。"
+  backupCodeUsedWarning: "已使用备用代码。如果无法使用认证应用，请尽快重新设定。"
+  backupCodesExhaustedWarning: "已使用完所有的备用代码。如果无法使用认证应用，将无法再访问您的账户。请再次设定认证应用。"
 _permissions:
   "read:account": "查看账户信息"
   "write:account": "更改帐户信息"
@@ -1730,6 +1773,10 @@ _permissions:
   "write:gallery": "操作图库"
   "read:gallery-likes": "读取喜欢的图片"
   "write:gallery-likes": "操作喜欢的图片"
+  "read:flash": "查看 Play"
+  "write:flash": "编辑 Play"
+  "read:flash-likes": "查看 Play 的点赞"
+  "write:flash-likes": "编辑 Play 的点赞列表"
 _auth:
   shareAccessTitle: "应用程序授权许可"
   shareAccess: "您要授权允许 “{name}” 访问您的帐户吗？"
@@ -1965,6 +2012,10 @@ _notification:
   unreadAntennaNote: "天线 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
   achievementEarned: "获得成就"
+  testNotification: "测试通知"
+  checkNotificationBehavior: "检查通知显示"
+  sendTestNotification: "发送测试通知"
+  notificationWillBeDisplayedLikeThis: "通知将会这样表示"
   _types:
     all: "全部"
     follow: "关注中"
@@ -2000,6 +2051,8 @@ _deck:
   introduction2: "您可以随时通过屏幕右侧的 + 来添加列"
   widgetsIntroduction: "从列菜单中，选择“小工具编辑”来添加小工具"
   useSimpleUiForNonRootPages: "用简易UI表示非根页面"
+  usedAsMinWidthWhenFlexible: "「自适应宽度」被启用的时候，这就是最小的宽度"
+  flexible: "自适应宽度"
   _columns:
     main: "主列"
     widgets: "小工具"

locales/zh-TW.yml

@@ -1,9 +1,9 @@
 ---
 _lang_: "繁體中文"
 headlineMisskey: "貼文連繫網絡"
-introMisskey: "歡迎！Misskey 是一個開源且去中心化的社群網路服務。\n發佈「貼文」向身邊的人分享您的想法！📡\n利用「反應」表達您對貼文的感覺！👍\n讓我們一起探索新的世界吧！🚀"
+introMisskey: "歡迎！Misskey 是一個開放原始碼且去中心化的社群網路服務。\n發布「貼文」向身邊的人分享您的想法！📡\n利用「反應」表達您對貼文的感覺！👍\n讓我們一起探索新的世界吧！🚀"
-poweredByMisskeyDescription: "{name}是使用開放原始碼平台<b>Misskey</b>的服務之一（稱為 Misskey 伺服器）。\n"
+poweredByMisskeyDescription: "{name}是開放原始碼平臺 <b>Misskey</b> 的伺服器之一。"
-monthAndDay: "{month}月 {day}日"
+monthAndDay: "{month} 月 {day} 日"
 search: "搜尋"
 notifications: "通知"
 username: "使用者名稱"
@@ -15,8 +15,8 @@ gotIt: "知道了"
 cancel: "取消"
 noThankYou: "現在不要"
 enterUsername: "輸入使用者名稱"
-renotedBy: "{user} 轉發了"
+renotedBy: "{user} 轉傳了"
-noNotes: "無貼文。"
+noNotes: "無貼文"
 noNotifications: "沒有通知"
 instance: "伺服器"
 settings: "設定"
@@ -26,7 +26,7 @@ otherSettings: "其他設定"
 openInWindow: "在新視窗開啟"
 profile: "個人檔案"
 timeline: "時間軸"
-noAccountDescription: "此用戶還沒有自我介紹"
+noAccountDescription: "此使用者尚未自我介紹"
 login: "登入"
 loggingIn: "登入中"
 logout: "登出"
@@ -45,6 +45,7 @@ pin: "置頂"
 unpin: "取消置頂"
 copyContent: "複製內容"
 copyLink: "複製連結"
+copyLinkRenote: "複製轉貼連結"
 delete: "刪除"
 deleteAndEdit: "刪除並編輯"
 deleteAndEditConfirm: "要刪除並再次編輯嗎？此貼文的所有反應、轉發和回覆也將會消失。"
@@ -105,10 +106,10 @@ unfollow: "取消追隨"
 followRequestPending: "追隨許可待批准"
 enterEmoji: "輸入表情符號"
 renote: "轉發"
-unrenote: "取消轉發"
+unrenote: "取消轉傳"
-renoted: "轉發成功"
+renoted: "轉傳成功"
-cantRenote: "無法轉發此貼文。"
+cantRenote: "無法轉傳此貼文。"
-cantReRenote: "無法轉發之前已經轉發過的內容。"
+cantReRenote: "無法轉傳之前已經轉傳過的內容。"
 quote: "引用"
 inChannelRenote: "在頻道內轉發"
 inChannelQuote: "在頻道內引用"
@@ -135,8 +136,8 @@ block: "封鎖"
 unblock: "解除封鎖"
 suspend: "凍結"
 unsuspend: "解除凍結"
-blockConfirm: "確定要封鎖此用戶？"
+blockConfirm: "確定要封鎖此使用者嗎？"
-unblockConfirm: "確定解除封鎖此用戶？"
+unblockConfirm: "確定要解除封鎖此使用者嗎？"
 suspendConfirm: "確定凍結此帳戶？"
 unsuspendConfirm: "確定解凍此帳戶？"
 selectList: "選擇清單"
@@ -155,15 +156,16 @@ emojiUrl: "表情符號URL"
 addEmoji: "新增表情符號"
 settingGuide: "推薦設定"
 cacheRemoteFiles: "快取遠端檔案"
-cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外連接數據。"
+cacheRemoteFilesDescription: "禁用此設定會停止建立遠端檔案快取，從而節省伺服器儲存空間，但會因從遠端讀取資料而增加網路數據用量。"
+youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，將快取全部刪除。"
 cacheRemoteSensitiveFiles: "快取遠端的敏感檔案"
 cacheRemoteSensitiveFilesDescription: "若停用這個設定，則不會快取遠端的敏感檔案，而是直接連結。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人。"
+flagAsBotDescription: "標記本帳戶由程式控制，防止其他程式與本帳戶產生無限互動的行為。"
 flagAsCat: "此帳戶是一隻貓，喵～～～！！！"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
-flagShowTimelineRepliesDescription: "啟用時，時間線除了顯示用戶的貼文以外，還會顯示用戶對其他貼文的回覆。"
+flagShowTimelineRepliesDescription: "啟用時，時間軸除了顯示使用者的貼文以外，還會顯示使用者對其他貼文的回覆。"
 autoAcceptFollowed: "自動允許來自追隨中使用者的追隨請求"
 addAccount: "新增帳戶"
 reloadAccountsList: "更新帳戶清單的資訊"
@@ -177,12 +179,12 @@ searchWith: "搜尋: {q}"
 youHaveNoLists: "你沒有任何清單"
 followConfirm: "你真的要追隨{name}嗎？"
 proxyAccount: "代理帳戶"
-proxyAccountDescription: "代理帳戶是在某些情況下充當其他伺服器用戶的帳戶。例如，當使用者將一個來自其他伺服器的帳戶放在列表中時，由於沒有其他使用者追隨該帳戶，該指令不會傳送到該伺服器上，因此會由代理帳戶追隨。"
+proxyAccountDescription: "代理帳戶是在特定條件下充當遠端追隨者的帳戶。例如，當使用者新增遠端使用者至其列表時，若沒有本地使用者追隨該遠端使用者，則其活動將不會傳送至伺服器，此時便會由代理帳戶代為追隨以解決問題。"
 host: "主機"
 selectUser: "選取使用者"
 recipient: "收件人"
 annotation: "註解"
-federation: "站台聯邦"
+federation: "聯邦宇宙"
 instances: "伺服器"
 registeredAt: "初次觀測"
 latestRequestReceivedAt: "上次收到的請求"
@@ -197,10 +199,10 @@ operations: "操作"
 software: "軟體"
 version: "版本"
 metadata: "元資料"
-withNFiles: "{n}個檔案"
+withNFiles: "{n} 個檔案"
 monitor: "監視器"
 jobQueue: "佇列"
-cpuAndMemory: "CPU及記憶體用量"
+cpuAndMemory: "CPU 及記憶體"
 network: "網路"
 disk: "硬碟"
 instanceInfo: "伺服器資訊"
@@ -213,8 +215,8 @@ clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
 blockedInstances: "已封鎖的伺服器"
 blockedInstancesDescription: "請逐行輸入需要封鎖的伺服器。已封鎖的伺服器將無法與本伺服器進行通訊。"
 muteAndBlock: "靜音和封鎖"
-mutedUsers: "已靜音用戶"
+mutedUsers: "被靜音的使用者"
-blockedUsers: "已封鎖用戶"
+blockedUsers: "被封鎖的使用者"
 noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
 noteDeleteConfirm: "確定刪除此貼文嗎？"
@@ -236,7 +238,7 @@ publishing: "直播中"
 notResponding: "沒有回應"
 instanceFollowing: "追隨的伺服器"
 instanceFollowers: "伺服器的追隨者"
-instanceUsers: "用戶"
+instanceUsers: "伺服器使用者"
 changePassword: "修改密碼"
 security: "安全性"
 retypedNotMatch: "兩次輸入不一致。"
@@ -246,7 +248,7 @@ newPasswordRetype: "確認密碼"
 attachFile: "上傳附件"
 more: "更多！"
 featured: "精選"
-usernameOrUserId: "使用者名稱或使用者ID"
+usernameOrUserId: "使用者名稱或使用者 ID"
 noSuchUser: "使用者不存在"
 lookup: "查詢"
 announcements: "公告"
@@ -262,16 +264,16 @@ upload: "上傳"
 keepOriginalUploading: "保留原圖"
 keepOriginalUploadingDescription: "上傳圖片時保留原始圖片。關閉時，瀏覽器會在上傳時生成適用於網路傳送的版本。"
 fromDrive: "從雲端空間"
-fromUrl: "從URL"
+fromUrl: "從 URL"
 uploadFromUrl: "從網址上傳"
-uploadFromUrlDescription: "您要上傳的文件的URL"
+uploadFromUrlDescription: "您要上傳的檔案網址"
 uploadFromUrlRequested: "已請求上傳"
 uploadFromUrlMayTakeTime: "還需要一些時間才能完成上傳。"
 explore: "探索"
 messageRead: "已讀"
 noMoreHistory: "沒有更多歷史紀錄"
 startMessaging: "開始聊天"
-nUsersRead: "{n}人已讀"
+nUsersRead: "{n} 人已讀"
 agreeTo: "我同意{0}"
 agree: "同意"
 agreeBelow: "同意以下內容"
@@ -284,7 +286,7 @@ activity: "動態"
 images: "圖片"
 image: "圖片"
 birthday: "生日"
-yearsOld: "{age}歲"
+yearsOld: "{age} 歲"
 registeredDate: "註冊日期"
 location: "位置"
 theme: "外觀主題"
@@ -292,8 +294,8 @@ themeForLightMode: "在淺色模式下使用的主題"
 themeForDarkMode: "在深色模式下使用的主題"
 light: "淺色"
 dark: "深色"
-lightThemes: "明亮主題"
+lightThemes: "淺色主題"
-darkThemes: "黑暗主題"
+darkThemes: "深色主題"
 syncDeviceDarkMode: "同步至此裝置的深色模式設定"
 drive: "雲端硬碟"
 fileName: "檔案名稱"
@@ -334,31 +336,30 @@ instanceName: "伺服器名稱"
 instanceDescription: "伺服器介紹"
 maintainerName: "管理員名稱"
 maintainerEmail: "管理員郵箱"
-tosUrl: "服務條款URL"
+tosUrl: "服務條款 URL"
 thisYear: "本年"
 thisMonth: "本月"
 today: "本日"
-dayX: "{day}日"
+dayX: "{day} 日"
-monthX: "{month}月"
+monthX: "{month} 月"
-yearX: "{year}年"
+yearX: "{year} 年"
 pages: "頁面"
 integration: "整合"
 connectService: "已連結"
 disconnectService: "已斷開 "
 enableLocalTimeline: "啟用本地時間軸"
 enableGlobalTimeline: "啟用全域時間軸"
-disablingTimelinesInfo: "為了方便，即使您關閉了時間線功能，管理員和審查員仍可以繼續使用。"
+disablingTimelinesInfo: "為了方便，即使您關閉了時間軸功能，管理員和審查員仍可以繼續使用。"
 registration: "註冊"
 enableRegistration: "開放新使用者註冊"
 invite: "邀請"
-driveCapacityPerLocalAccount: "每個本地用戶的雲端空間大小"
+driveCapacityPerLocalAccount: "每個本地使用者的雲端硬碟容量"
 driveCapacityPerRemoteAccount: "每個非本地用戶的雲端空間大小"
 inMb: "以Mbps為單位"
-iconUrl: "圖標 URL（例如 favicon）"
 bannerUrl: "橫幅圖片URL"
 backgroundImageUrl: "背景圖片的來源網址 "
 basicInfo: "基本資訊"
-pinnedUsers: "置頂用戶"
+pinnedUsers: "置頂使用者"
 pinnedUsersDescription: "在「探索」頁面中使用換行標記想要置頂的使用者。"
 pinnedPages: "釘選頁面"
 pinnedPagesDescription: "輸入要固定至實例首頁的頁面路徑，以換行符分隔。"
@@ -386,7 +387,7 @@ antennaExcludeKeywords: "排除關鍵字"
 antennaKeywordsDescription: "空格代表「以及」（AND），換行代表「或者」（OR）"
 notifyAntenna: "通知有新貼文"
 withFileAntenna: "僅帶有附件的貼文"
-enableServiceworker: "啟用 ServiceWorker"
+enableServiceworker: "啟用瀏覽器的推播通知"
 antennaUsersDescription: "填寫使用者名稱，以換行分隔"
 caseSensitive: "區分大小寫"
 withReplies: "包含回覆"
@@ -394,7 +395,7 @@ connectedTo: "您的帳戶已連接到以下社交帳戶"
 notesAndReplies: "貼文與回覆"
 withFiles: "附件"
 silence: "禁言"
-silenceConfirm: "確定要禁言此帳戶嗎？"
+silenceConfirm: "確定要禁言此使用者嗎？"
 unsilence: "解除禁言"
 unsilenceConfirm: "確定要解除禁言嗎？"
 popularUsers: "熱門使用者"
@@ -410,10 +411,13 @@ aboutMisskey: "關於 Misskey"
 administrator: "管理員"
 token: "權杖"
 2fa: "雙重驗證"
+setupOf2fa: "設定雙重驗證"
 totp: "驗證應用程式"
 totpDescription: "以驗證應用程式輸入一次性密碼"
 moderator: "審查員"
 moderation: "審查"
+moderationNote: "管理筆記"
+addModerationNote: "新增管理筆記"
 nUsersMentioned: "被提及到 {n} 次"
 securityKeyAndPasskey: "安全金鑰、Passkey"
 securityKey: "安全金鑰"
@@ -426,8 +430,8 @@ resetPassword: "重設密碼"
 newPasswordIs: "新密碼為「{password}」"
 reduceUiAnimation: "減少介面的動態視覺"
 share: "分享"
-notFound: "找不到"
+notFound: "查無項目"
-notFoundDescription: "找不到該 URL 的頁面"
+notFoundDescription: "查無此頁"
 uploadFolder: "預設上傳資料夾"
 cacheClear: "清除快取"
 markAsReadAllNotifications: "標記所有通知為已讀"
@@ -476,7 +480,7 @@ disableDrawer: "不顯示下拉式選單"
 showNoteActionsOnlyHover: "僅在游標停留時顯示貼文的操作選項"
 noHistory: "沒有歷史紀錄"
 signinHistory: "登入歷史"
-enableAdvancedMfm: "啟用高級 MFM"
+enableAdvancedMfm: "啟用進階 MFM"
 enableAnimatedMfm: "啟用 MFM 動畫"
 doing: "正在進行"
 category: "類別"
@@ -487,7 +491,7 @@ existingAccount: "現有帳戶"
 regenerate: "再次生成"
 fontSize: "字體大小"
 mediaListWithOneImageAppearance: "只有一張圖片時的媒體列表高度"
-limitTo: "上限為{x}"
+limitTo: "上限為 {x}"
 noFollowRequests: "沒有追隨您的請求"
 openImageInNewTab: "於新分頁中開啟圖片"
 dashboard: "儀表板"
@@ -504,10 +508,10 @@ promote: "推廣"
 numberOfDays: "有效天數"
 hideThisNote: "隱藏此貼文"
 showFeaturedNotesInTimeline: "在時間軸上顯示熱門推薦"
-objectStorage: "Object Storage (物件儲存)"
+objectStorage: "對象存儲"
-useObjectStorage: "使用Object Storage"
+useObjectStorage: "使用對象存儲"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "引用時的 URL。如果您使用的是 CDN 或反向代理，請指定其 URL，例如 S3（https://<bucket>.s3.amazonaws.com）、GCS（https://storage.googleapis.com/<bucket>）。"
+objectStorageBaseUrlDesc: "用於引用的 URL。如果您使用的是 CDN 或反向代理，請指定其 URL，例如 S3（https://<bucket>.s3.amazonaws.com）、GCS（https://storage.googleapis.com/<bucket>）。"
 objectStorageBucket: "儲存空間（Bucket）"
 objectStorageBucketDesc: "請填寫所用服務的儲存空間（Bucket）名稱。 "
 objectStoragePrefix: "前綴"
@@ -532,7 +536,7 @@ sound: "音效"
 listen: "聆聽"
 none: "無"
 showInPage: "在頁面中顯示"
-popout: "彈出型窗口"
+popout: "彈出式視窗"
 volume: "音量"
 masterVolume: "主音量"
 details: "詳細資訊"
@@ -542,7 +546,7 @@ recentUsed: "最近使用"
 install: "安裝"
 uninstall: "解除安裝"
 installedApps: "已授權的應用程式"
-nothing: "未發現"
+nothing: "無"
 installedDate: "安裝時間"
 lastUsedDate: "最後上線日期"
 state: "狀態"
@@ -550,7 +554,7 @@ sort: "排序"
 ascendingOrder: "昇冪"
 descendingOrder: "降冪"
 scratchpad: "暫存記憶體"
-scratchpadDescription: "AiScript 控制台為 AiScript 的實驗環境。您可以在此編寫、執行和確認程式碼與 Misskey 互動的结果。"
+scratchpadDescription: "AiScript 控制臺為 AiScript 的實驗環境。您可以在此編寫、執行和確認程式碼與 Misskey 互動的結果。"
 output: "輸出"
 script: "腳本"
 disablePagesScript: "停用頁面的 AiScript 腳本"
@@ -559,8 +563,8 @@ deleteAllFiles: "刪除所有檔案"
 deleteAllFilesConfirm: "要刪除所有檔案嗎？"
 removeAllFollowing: "解除所有追隨"
 removeAllFollowingDescription: "解除{host}所有的追隨。在伺服器不再存在時執行。"
-userSuspended: "該使用者已被停用"
+userSuspended: "該使用者已被停用。"
-userSilenced: "該用戶已被禁言。"
+userSilenced: "該使用者已被禁言。"
 yourAccountSuspendedTitle: "帳戶已被凍結"
 yourAccountSuspendedDescription: "該帳戶已因違反伺服器服務條款或其他原因而被凍結。您可以向管理員查詢更多資訊。請不要建立新帳戶。"
 tokenRevoked: "權杖無效"
@@ -653,6 +657,7 @@ behavior: "行為"
 sample: "範例"
 abuseReports: "檢舉"
 reportAbuse: "檢舉"
+reportAbuseRenote: "檢舉轉貼"
 reportAbuseOf: "檢舉{name}"
 fillAbuseReportDescription: "請填寫檢舉的詳細理由。如有需要，請附上相關 URL。"
 abuseReported: "檢舉完成。感謝您的報告。"
@@ -680,7 +685,8 @@ createNewClip: "建立新摘錄"
 unclip: "解除摘錄"
 confirmToUnclipAlreadyClippedNote: "此貼文已包含在摘錄「{name}」中。 你想將貼文從這個摘錄中排除嗎？"
 public: "公開"
-i18nInfo: "Misskey 已被志願者們翻譯成各種語言版本。您可以瀏覽{link}幫助翻譯。"
+private: "私密"
+i18nInfo: "Misskey 已被志願者們翻譯成各種語言版本。您可以瀏覽 {link} 幫助翻譯。"
 manageAccessTokens: "管理存取權杖"
 accountInfo: "帳戶資訊"
 notesCount: "貼文數量"
@@ -688,7 +694,7 @@ repliesCount: "回覆數量"
 renotesCount: "轉發數量"
 repliedCount: "回覆數量"
 renotedCount: "轉發次數"
-followingCount: "正在追隨的用戶數量"
+followingCount: "正在追隨的使用者數量"
 followersCount: "追隨者數量"
 sentReactionsCount: "反應發送次數"
 receivedReactionsCount: "收到反應次數"
@@ -719,7 +725,7 @@ thisIsExperimentalFeature: "這是實驗性的功能。可能會有變更規格
 developer: "開發者"
 makeExplorable: "使自己的帳戶能夠在「探索」頁面中顯示"
 makeExplorableDescription: "如果關閉，帳戶將不會被顯示在「探索」頁面中。"
-showGapBetweenNotesInTimeline: "分開顯示時間線上的貼文。"
+showGapBetweenNotesInTimeline: "分開顯示時間軸上的貼文。"
 duplicate: "複製"
 left: "左"
 center: "置中"
@@ -729,11 +735,11 @@ reloadToApplySetting: "設定將會在頁面重新載入之後生效。要現在
 needReloadToApply: "必須重新載入才會生效。"
 showTitlebar: "顯示標題列"
 clearCache: "清除快取資料"
-onlineUsersCount: "{n}人正在線上"
+onlineUsersCount: "{n} 人上線"
-nUsers: "{n}用戶"
+nUsers: "{n} 使用者"
-nNotes: "{n}貼文"
+nNotes: "{n} 貼文"
 sendErrorReports: "傳送錯誤報告"
-sendErrorReportsDescription: "啟用後，問題報告將傳送至開發者以提升軟體品質。問題報告可能包括OS版本，瀏覽器類型，行為歷史記錄等。"
+sendErrorReportsDescription: "傳送問題報告至開發者以提升軟體品質。問題報告可能包括作業系統版本，瀏覽器類型，行為歷史記錄等。"
 myTheme: "我的佈景主題"
 backgroundColor: "背景"
 accentColor: "重點色彩"
@@ -765,18 +771,18 @@ inChannelSearch: "頻道内搜尋"
 useReactionPickerForContextMenu: "點擊右鍵開啟反應工具欄"
 typingUsers: "{users}輸入中"
 jumpToSpecifiedDate: "跳轉到特定日期"
-showingPastTimeline: "顯示過往的時間線"
+showingPastTimeline: "顯示過往的時間軸"
 clear: "清除"
 markAllAsRead: "全部標示為已讀"
 goBack: "返回"
 unlikeConfirm: "要取消按讚嗎？"
-fullView: "全熒幕顯示"
+fullView: "全螢幕顯示"
 quitFullView: "退出全螢幕顯示"
 addDescription: "新增描述"
-userPagePinTip: "在貼文的選單中選擇\"置頂\"，即可置頂該貼文至您的個人檔案頁面。"
+userPagePinTip: "在貼文的選單中選擇「置頂」，即可置頂該貼文至您的個人檔案頁面。"
 notSpecifiedMentionWarning: "此貼文有未指定的提及"
 info: "資訊"
-userInfo: "用戶資料"
+userInfo: "使用者資訊"
 unknown: "未知"
 onlineStatus: "上線狀態"
 hideOnlineStatus: "隱藏上線狀態"
@@ -835,7 +841,7 @@ accountDeletionInProgress: "正在刪除帳戶"
 usernameInfo: "在伺服器上您的帳戶是唯一的識別名稱。您可以使用字母 (a ~ z, A ~ Z)、數字 (0 ~ 9) 和下底線 (_)。之後帳戶名是不能更改的。"
 aiChanMode: "小藍模式"
 devMode: "開發者模式"
-keepCw: "保持 CW"
+keepCw: "保持隱藏內容"
 pubSub: "Pub/Sub 帳戶"
 lastCommunication: "最近的通信"
 resolved: "已解決"
@@ -849,7 +855,7 @@ off: "關閉"
 emailRequiredForSignup: "註冊帳戶需要電子郵件地址"
 unread: "未讀"
 filter: "篩選"
-controlPanel: "控制台"
+controlPanel: "控制臺"
 manageAccounts: "管理帳戶"
 makeReactionsPublic: "將反應設為公開"
 makeReactionsPublicDescription: "將您做過的反應設為公開可見。"
@@ -893,8 +899,8 @@ cropImageAsk: "要剪裁圖片嗎？"
 cropYes: "裁剪"
 cropNo: "使用原圖"
 file: "檔案"
-recentNHours: "過去{n}小時"
+recentNHours: "過去 {n} 小時"
-recentNDays: "過去{n}天"
+recentNDays: "過去 {n} 天"
 noEmailServerWarning: "尚未設定電子郵件伺服器。"
 thereIsUnresolvedAbuseReportWarning: "有尚未處理的檢舉。"
 recommended: "推薦"
@@ -930,7 +936,7 @@ cannotUploadBecauseExceedsFileSizeLimit: "由於超過了檔案大小的限制
 beta: "測試版"
 enableAutoSensitive: "自動 NSFW 判定"
 enableAutoSensitiveDescription: "如果可用，它將使用機器學習技術判斷多媒體內容是否需要標記 NSFW。即使關閉此功能，也可能會依實例規則而自動啟用。"
-activeEmailValidationDescription: "積極驗證帳戶的電郵地址，以判斷它是否可以通訊。關閉此選項代表只會檢查地址是否符合格式。"
+activeEmailValidationDescription: "積極驗證使用者的電郵地址，以判斷它是否可以通訊。關閉此選項代表只會檢查地址是否符合格式。"
 navbar: "導覽列"
 shuffle: "隨機"
 account: "帳戶"
@@ -1015,10 +1021,10 @@ drivecleaner: "雲端硬碟清掃器"
 retryAllQueuesNow: "立刻重試所有佇列"
 retryAllQueuesConfirmTitle: "要現在重試嗎？"
 retryAllQueuesConfirmText: "伺服器的負荷可能會暫時增加。"
-enableChartsForRemoteUser: "生成遠端用戶的圖表"
+enableChartsForRemoteUser: "生成遠端使用者的圖表"
 enableChartsForFederatedInstances: "生成遠端伺服器的圖表"
 showClipButtonInNoteFooter: "新增摘錄至貼文"
-largeNoteReactions: "放大顯示貼文反應"
+reactionsDisplaySize: "表情回應的顯示尺寸"
 noteIdOrUrl: "貼文ID或URL"
 video: "影片"
 videos: "影片"
@@ -1094,6 +1100,27 @@ expired: "過期"
 doYouAgree: "你同意嗎？"
 beSureToReadThisAsItIsImportant: "重要，請務必閱讀。"
 iHaveReadXCarefullyAndAgree: "我已仔細閱讀並同意「{x}」的内容。"
+dialog: "對話方塊"
+icon: "圖示"
+forYou: "給您"
+currentAnnouncements: "最新公告"
+pastAnnouncements: "歷史公告"
+youHaveUnreadAnnouncements: "有未讀的公告。"
+useSecurityKey: "請按照瀏覽器或設備上的說明使用安全金鑰或 Passkey。"
+replies: "回覆"
+renotes: "轉發"
+loadReplies: "閱覽回覆"
+loadConversation: "閱覽對話"
+pinnedList: "已置頂的清單"
+_announcement:
+  forExistingUsers: "僅限既有的使用者"
+  forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。"
+  needConfirmationToRead: "必須確認才能標記為已讀"
+  needConfirmationToReadDescription: "啟用代表此公告將顯示對話方塊以確認是否標記為已讀，同時不會受「標記所有公告為已讀」功能影響。"
+  end: "結束公告"
+  tooManyActiveAnnouncementDescription: "有過多公告可能會影響使用者體驗。請考慮歸檔已結束的公告。"
+  readConfirmTitle: "標記為已讀嗎？"
+  readConfirmText: "閱讀「{title}」的內容並標記為已讀。"
 _initialAccountSetting:
   accountCreated: "帳戶已建立完成！"
   letsStartAccountSetup: "來進行帳戶的初始設定吧。"
@@ -1106,11 +1133,18 @@ _initialAccountSetting:
   pushNotificationDescription: "啟用推送通知，就可以在設備上接收{name}的通知。"
   initialAccountSettingCompleted: "初始設定完成了！"
   haveFun: "盡情享受{name}吧！"
-  ifYouNeedLearnMore: "關於如何使用{name}(Misskey)的詳細資訊，請見{link}。"
+  ifYouNeedLearnMore: "請瀏覽{link}以更瞭解{name}（Misskey）的使用方法。"
   skipAreYouSure: "要略過初始設定嗎？"
   laterAreYouSure: "稍後再重新進行初始設定嗎？"
 _serverRules:
   description: "設定在註冊頁面顯示的伺服器簡要規則。建議是服務條款的摘要。"
+_serverSettings:
+  iconUrl: "圖示的 URL"
+  appIconDescription: "指定顯示 {host} 為應用程式時的圖示。"
+  appIconUsageExample: "例如：漸進式網路應用程式（PWA）、於手機桌面新增書籤"
+  appIconStyleRecommendation: "因為可能會裁剪成圓形或圓角，所以建議用單色填滿邊框及背景。"
+  appIconResolutionMustBe: "解析度必須為 {resolution}。"
+  manifestJsonOverride: "覆寫 manifest.json"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
   moveFromSub: "為另一個帳戶建立別名"
@@ -1119,7 +1153,7 @@ _accountMigration:
   moveTo: "將這個帳戶遷移至新的帳戶"
   moveToLabel: "要遷移到的帳戶："
   moveCannotBeUndone: "一旦遷移帳戶，就無法取消。"
-  moveAccountDescription: "這個操作不可撤銷。首先，請確認已在要遷移到的帳戶中為這個帳戶建立了一個別名。建立別名之後，像這樣輸入你要遷移到的帳戶：@person@instance.com"
+  moveAccountDescription: "遷移至新帳戶。\n　・此帳戶的追隨者將自動追隨新帳戶；\n　・此帳戶的所有追隨者將被取消追隨；\n　・此帳戶不能再發文。\n\n雖然會自動遷移您追隨者，但必須手動遷移您追隨的帳戶。請在遷移前匯出此帳戶的「追隨中」名單，並在遷移後自行匯入。\n列表名單、靜音名單及封鎖名單也必須如此處理。\n\n（此說明適用於本伺服器，以及運行 Misskey v13.12.0 或更新版本的其他伺服器；如 Mastodon 等使用 ActivityPub 協定的其他軟體或有不同的處理方式。）"
   moveAccountHowTo: "要遷移帳戶，首先要在目標帳戶中為此帳戶建立一個別名。\n 建立別名後，像這樣輸入目標帳戶：@username@server.example.com"
   startMigration: "遷移"
   migrationConfirm: "確定要將這個帳戶遷移至 {account} 嗎？一旦遷移就無法撤銷，也就無法以原來的狀態使用這個帳戶。\n另外，請確認在要遷移到的帳戶已經建立了一個別名。"
@@ -1242,7 +1276,7 @@ _achievements:
       title: "有備而來"
       description: "設定了個人檔案"
     _markedAsCat:
-      title: "吾輩乃貓是也"
+      title: "我是貓"
       description: "已將帳戶設定為貓"
       flavor: "還沒有名字。"
     _following1:
@@ -1264,7 +1298,7 @@ _achievements:
       title: "第一個追隨者"
       description: "第一次被追隨"
     _followers10:
-      title: "Follow me!"
+      title: "追隨我吧！"
       description: "追隨者超過10人了"
     _followers50:
       title: "成群結隊"
@@ -1273,20 +1307,20 @@ _achievements:
       title: "熱門人物"
       description: "追隨者超過100人了"
     _followers300:
-      title: "請排成一排"
+      title: "請排隊"
       description: "追隨者超過300人了"
     _followers500:
-      title: "基地台"
+      title: "基地臺"
       description: "超過五百名追隨者了"
     _followers1000:
-      title: "影響者"
+      title: "星光熠熠"
       description: "超過一千名追隨者了"
     _collectAchievements30:
       title: "成就收藏家"
       description: "獲得三十個以上的成就"
     _viewAchievements3min:
-      title: "喜愛成就"
+      title: "成就發燒友"
-      description: "看成就列表要花三分鐘以上"
+      description: "看著成就列表超過三分鐘"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "發佈「I ❤ #Misskey」"
@@ -1298,34 +1332,34 @@ _achievements:
       title: "休息一下"
       description: "客戶端啟動已超過30分鐘"
     _client60min:
-      title: "Misskey看太多"
+      title: "Misskey 看太多"
       description: "客戶端啟動已超過60分鐘"
     _noteDeletedWithin1min:
-      title: "現在沒有了"
+      title: "欲言又止"
-      description: "發文後1分鐘內刪文"
+      description: "發文後一分鐘內刪文"
     _postedAtLateNight:
-      title: "夜行性"
+      title: "夜貓子"
       description: "在深夜發佈貼文"
       flavor: "該去睡覺了。"
     _postedAt0min0sec:
       title: "報時"
-      description: "在0分0秒發佈貼文"
+      description: "在零分零秒發佈貼文"
-      flavor: "啵．啵．啵．嗶ー"
+      flavor: "啵、啵、啵、嗶ーー"
     _selfQuote:
       title: "自我引用"
       description: "引用了自己的貼文"
     _htl20npm:
-      title: "流動的TL"
+      title: "源源不絕"
-      description: "在首頁時間軸的流速超過20npm"
+      description: "首頁時間軸在一分鐘內出現超過二十篇貼文"
     _viewInstanceChart:
       title: "分析師"
       description: "顯示了實例的圖表"
     _outputHelloWorldOnScratchpad:
-      title: "Hello world!"
+      title: "Hello, world!"
-      description: "在暫存記憶體輸出了 hello world"
+      description: "在 AiScript 控制臺輸出了「hello world」"
     _open3windows:
       title: "多重視窗"
-      description: "開啟了3個以上的視窗"
+      description: "開啟過三個以上的視窗"
     _driveFolderCircularReference:
       title: "循環引用"
       description: "試圖遞迴套入雲端硬碟資料夾"
@@ -1337,34 +1371,37 @@ _achievements:
       description: "已點擊這裡了"
     _justPlainLucky:
       title: "只是運氣好"
-      description: "每10秒有0.01%的機率獲得"
+      description: "每十秒有二萬分之一（0.005%）的機率獲得"
     _setNameToSyuilo:
-      title: "神的情結"
+      title: "神與您同在"
       description: "將名稱設定為 syuilo"
     _passedSinceAccountCreated1:
-      title: "一周年"
+      title: "一週年"
-      description: "自建立帳戶開始過了1年"
+      description: "帳戶加入時間已超過一年"
     _passedSinceAccountCreated2:
-      title: "二周年"
+      title: "二週年"
-      description: "自建立帳戶開始過了2年"
+      description: "帳戶加入時間已超過兩年"
     _passedSinceAccountCreated3:
-      title: "三周年"
+      title: "三週年"
-      description: "自建立帳戶開始過了3年"
+      description: "帳戶加入時間已超過三年"
     _loggedInOnBirthday:
       title: "生日快樂"
       description: "在生日當天登入了"
     _loggedInOnNewYearsDay:
       title: "新年快樂"
       description: "在元旦當天登入了"
-      flavor: "今年也請對敝實例多多指教"
+      flavor: "今年也請您多多指教！"
     _cookieClicked:
       title: "點擊餅乾的遊戲"
       description: "點擊了餅乾"
       flavor: "是不是軟體有問題？"
     _brainDiver:
       title: "Brain Driver"
-      description: "發佈了Brain Driver的連結"
+      description: "發佈一篇含歌曲《Brain Driver》連結的貼文"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "過度測試"
+      description: "極短時間內連續測試通知"
 _role:
   new: "建立角色"
   edit: "編輯角色"
@@ -1387,7 +1424,7 @@ _role:
   chooseRoleToAssign: "選擇要指派的角色"
   iconUrl: "圖示的URL"
   asBadge: "顯示為徽章"
-  descriptionOfAsBadge: "開啟的話，角色圖示會顯示在用戶名旁邊。"
+  descriptionOfAsBadge: "開啟的話，角色圖示會顯示在使用者名稱旁邊。"
   isExplorable: "讓使用者更容易找到您"
   descriptionOfIsExplorable: "若開啟則公開角色時間軸。若角色不是公開的，則無法公開時間軸。"
   displayOrder: "顯示順序"
@@ -1425,8 +1462,8 @@ _role:
   _condition:
     isLocal: "本地使用者"
     isRemote: "遠端使用者"
-    createdLessThan: "自建立帳戶開始～以內"
+    createdLessThan: "帳戶加入時間不超過"
-    createdMoreThan: "自建立帳戶開始～經過"
+    createdMoreThan: "帳戶加入時間已超過"
     followersLessThanOrEq: "追隨者人數在～以下"
     followersMoreThanOrEq: "追隨者人數在～以上"
     followingLessThanOrEq: "追隨人數在～以下"
@@ -1452,7 +1489,7 @@ _emailUnavailable:
   smtp: "郵件伺服器沒有應答"
 _ffVisibility:
   public: "公開"
-  followers: "只有關注你的用戶能看到"
+  followers: "只有關注您的使用者能看到"
   private: "私密"
 _signup:
   almostThere: "即將完成"
@@ -1513,7 +1550,7 @@ _registry:
   domain: "域"
   createKey: "新增機碼"
 _aboutMisskey:
-  about: "Misskey是由syuilo自2014年起開發的開源軟體。"
+  about: "Misskey 是由 syuilo 自 2014 年起開發的開放原始碼軟體。"
   contributors: "主要貢獻者"
   allContributors: "全體貢獻人員"
   source: "原始碼"
@@ -1541,8 +1578,8 @@ _channel:
   featured: "熱門貼文"
   owned: "管理中"
   following: "追隨中"
-  usersCount: "有{n}人參與"
+  usersCount: "有 {n} 人參與"
-  notesCount: "有{n}個貼文"
+  notesCount: "有 {n} 篇貼文"
   nameAndDescription: "名稱與說明"
   nameOnly: "僅名稱"
 _menuDisplay:
@@ -1560,7 +1597,7 @@ _wordMute:
   hard: "硬性靜音"
   mutedNotes: "已靜音的貼文"
 _instanceMute:
-  instanceMuteDescription: "包括對被靜音實例上的用戶的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
+  instanceMuteDescription: "包括對被靜音實例上的使用者的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
   instanceMuteDescription2: "換行以分隔"
   title: "將隱藏被設定的實例貼文。"
   heading: "將實例靜音"
@@ -1622,9 +1659,9 @@ _theme:
     infoFg: "資訊內容"
     infoWarnBg: "警告背景"
     infoWarnFg: "警告文字"
-    cwBg: "CW 按鈕背景"
+    cwBg: "隱藏內容按鈕背景"
-    cwFg: "CW 按鈕文字"
+    cwFg: "隱藏內容按鈕文字"
-    cwHoverBg: "CW 按鈕背景（懸浮）"
+    cwHoverBg: "隱藏內容按鈕背景（懸浮）"
     toastBg: "通知背景"
     toastFg: "通知文本"
     buttonBg: "按鈕背景"
@@ -1649,14 +1686,14 @@ _sfx:
 _ago:
   future: "未來"
   justNow: "剛剛"
-  secondsAgo: "{n}秒前"
+  secondsAgo: "{n} 秒前"
-  minutesAgo: "{n}分鐘前"
+  minutesAgo: "{n}分鐘前 "
-  hoursAgo: "{n}小時前"
+  hoursAgo: "{n} 小時前"
-  daysAgo: "{n}天前"
+  daysAgo: "{n} 天前"
-  weeksAgo: "{n}週前"
+  weeksAgo: "{n} 週前"
-  monthsAgo: "{n}個月前"
+  monthsAgo: "{n} 個月前"
-  yearsAgo: "{n}年前"
+  yearsAgo: "{n} 年前"
-  invalid: "未發現"
+  invalid: "無"
 _time:
   second: "秒"
   minute: "分鐘"
@@ -1679,14 +1716,14 @@ _2fa:
   step1: "首先，在您的裝置上安裝驗證程式，例如 {a} 或 {b}。"
   step2: "然後，掃描螢幕上的 QR 碼。"
   step2Click: "您可以點擊 QR 碼，以使用裝置上的驗證應用程式或金鑰環註冊。"
-  step2Url: "請在桌面版應用程式中輸入以下的 URL："
+  step2Uri: "使用桌面版應用程式時，請輸入以下的 URI"
   step3Title: "輸入驗證碼"
   step3: "輸入應用程式所提供的權杖以完成設定。"
+  setupCompleted: "設定完成"
   step4: "從現在開始，任何登入操作都將要求您提供權杖。"
   securityKeyNotSupported: "您的瀏覽器不支援安全金鑰。"
   registerTOTPBeforeKey: "如要註冊安全金鑰或 Passkey，請先設定驗證應用程式。"
   securityKeyInfo: "您可以設定使用支援 FIDO2 的硬體安全鎖、終端設備的指紋認證，或者 PIN 碼來登入。"
-  chromePasskeyNotSupported: "目前不支援 Chrome 的 Passkey。"
   registerSecurityKey: "註冊安全金鑰或 Passkey"
   securityKeyName: "輸入金鑰名稱"
   tapSecurityKey: "按照瀏覽器的說明註冊安全金鑰或 Passkey。"
@@ -1697,16 +1734,21 @@ _2fa:
   renewTOTPConfirm: "目前驗證應用程式的驗證碼將無法使用。"
   renewTOTPOk: "重設"
   renewTOTPCancel: "現在不要"
+  checkBackupCodesBeforeCloseThisWizard: "請先確認下列備用驗證碼，再關閉此精靈視窗。"
+  backupCodes: "備用驗證碼"
+  backupCodesDescription: "如果驗證應用程式不能用了，可以使用以下的備用驗證碼存取您的帳戶。請務必妥善保管這個驗證碼。每個驗證碼只能使用一次。"
+  backupCodeUsedWarning: "已使用備用驗證碼。如果無法使用驗證應用程式，請盡快重新設定。"
+  backupCodesExhaustedWarning: "已使用所有備用驗證碼。如果無法使用驗證應用程式，則將無法再存取您的帳戶。請重新設定您的驗證應用程式。"
 _permissions:
   "read:account": "查看我的帳戶資訊"
   "write:account": "更改我的帳戶資訊"
-  "read:blocks": "已封鎖用戶名單"
+  "read:blocks": "查看封鎖名單"
-  "write:blocks": "編輯已封鎖用戶名單"
+  "write:blocks": "編輯封鎖名單"
   "read:drive": "存取雲端硬碟"
   "write:drive": "編輯雲端硬碟的檔案"
   "read:favorites": "瀏覽我的最愛"
   "write:favorites": "編輯我的最愛列表"
-  "read:following": "查看追隨中的用戶資訊"
+  "read:following": "查看追隨中的使用者資訊"
   "write:following": "追隨／解除追隨"
   "read:messaging": "顯示訊息"
   "write:messaging": "撰寫或刪除訊息"
@@ -1730,10 +1772,14 @@ _permissions:
   "write:gallery": "操作圖庫"
   "read:gallery-likes": "讀取喜歡的圖片"
   "write:gallery-likes": "操作喜歡的圖片"
+  "read:flash": "檢視 Play"
+  "write:flash": "編輯 Play"
+  "read:flash-likes": "檢視 Play 的讚"
+  "write:flash-likes": "編輯 Play 的讚"
 _auth:
   shareAccessTitle: "應用程式的存取權限"
   shareAccess: "要授權「“{name}”」存取您的帳戶嗎？"
-  shareAccessAsk: "您確定要授權這個應用程式使用您的帳戶嗎？"
+  shareAccessAsk: "您確定要授權這個應用程式存取您的帳戶嗎？"
   permission: "{name}要求以下的權限"
   permissionAsk: "此應用程式需要以下權限"
   pleaseGoBack: "請返回至應用程式"
@@ -1760,7 +1806,7 @@ _widgets:
   notifications: "通知"
   timeline: "時間軸"
   calendar: "行事曆"
-  trends: "發燒貼文"
+  trends: "熱門貼文"
   clock: "時鐘"
   rss: "RSS 閱讀器"
   rssTicker: "RSS 跑馬燈"
@@ -1768,15 +1814,15 @@ _widgets:
   photos: "照片"
   digitalClock: "電子時鐘"
   unixClock: "UNIX 時間"
-  federation: "站台聯邦"
+  federation: "聯邦宇宙"
   instanceCloud: "實例雲"
-  postForm: "發佈窗口"
+  postForm: "發文視窗"
   slideshow: "幻燈片"
   button: "按鈕"
-  onlineUsers: "線上的用戶"
+  onlineUsers: "上線使用者"
   jobQueue: "佇列"
   serverMetric: "伺服器指標 "
-  aiscript: "AiScript 控制台"
+  aiscript: "AiScript 控制臺"
   aiscriptApp: "AiScript App"
   aichan: "小藍"
   userList: "使用者列表"
@@ -1789,8 +1835,8 @@ _cw:
   chars: "{count} 個字元"
   files: "{count} 個檔案"
 _poll:
-  noOnlyOneChoice: "至少需要兩個選項。"
+  noOnlyOneChoice: "需要至少兩個選項。"
-  choiceN: "選擇 {n}"
+  choiceN: "選項 {n}"
   noMore: "沒辦法再添加選項了"
   canMultipleVote: "可以多次投票"
   expiration: "期限"
@@ -1812,7 +1858,7 @@ _poll:
   remainingSeconds: "{s} 秒後截止"
 _visibility:
   public: "公開"
-  publicDescription: "發佈給所有帳戶"
+  publicDescription: "發佈給所有使用者"
   home: "首頁"
   homeDescription: "僅發布至首頁的時間軸"
   followers: "追隨者"
@@ -1837,8 +1883,8 @@ _profile:
   username: "使用者名稱"
   description: "關於我"
   youCanIncludeHashtags: "你也可以在「關於我」中加上 #tag"
-  metadata: "進階資訊"
+  metadata: "附加資訊"
-  metadataEdit: "編輯進階資訊"
+  metadataEdit: "編輯附加資訊"
   metadataDescription: "可以在個人資料中以表格形式顯示其他資訊。"
   metadataLabel: "標籤"
   metadataContent: "内容"
@@ -1851,10 +1897,10 @@ _exportOrImport:
   muteList: "靜音"
   blockingList: "封鎖"
   userLists: "清單"
-  excludeMutingUsers: "排除被靜音的用戶"
+  excludeMutingUsers: "排除被靜音的使用者"
   excludeInactiveUsers: "排除不活躍帳戶"
 _charts:
-  federation: "站台聯邦"
+  federation: "聯邦宇宙"
   apRequest: "請求"
   usersIncDec: "使用者增減"
   usersTotal: "使用者合共"
@@ -1895,7 +1941,7 @@ _play:
   viewSource: "檢視原始碼"
   my: "自己的 Play"
   liked: "按讚的 Play"
-  featured: "人氣"
+  featured: "熱門"
   title: "標題"
   script: "腳本"
   summary: "描述"
@@ -1917,7 +1963,7 @@ _pages:
   unlike: "收回讚好"
   my: "我的頁面"
   liked: "已讚好的頁面"
-  featured: "人氣"
+  featured: "熱門"
   inspector: "面板檢查"
   contents: "內容"
   content: "頁面方塊"
@@ -1965,6 +2011,10 @@ _notification:
   unreadAntennaNote: "天線 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
   achievementEarned: "獲得成就"
+  testNotification: "通知測試"
+  checkNotificationBehavior: "確認通知的顯示行為"
+  sendTestNotification: "發送測試通知"
+  notificationWillBeDisplayedLikeThis: "通知會以這樣的方式顯示"
   _types:
     all: "全部 "
     follow: "追隨中"
@@ -1999,7 +2049,9 @@ _deck:
   introduction: "組合多個欄位，製作屬於自己的介面吧！"
   introduction2: "您可以隨時按畫面右方的「+」新增欄位。"
   widgetsIntroduction: "請從欄位選單中選擇「編輯小工具」新增小工具。"
-  useSimpleUiForNonRootPages: "用簡易 UI 顯示非根頁面"
+  useSimpleUiForNonRootPages: "用簡易介面顯示非根頁面"
+  usedAsMinWidthWhenFlexible: "如果啟用「自動調整寬度」，此為最小寬度"
+  flexible: "自動調整寬度"
   _columns:
     main: "主列"
     widgets: "小工具"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "13.14.2",
+	"version": "2023.9.0-beta.10",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@8.6.10",
+	"packageManager": "pnpm@8.7.6",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -15,15 +15,15 @@
 	"private": true,
 	"scripts": {
 		"build-pre": "node ./scripts/build-pre.js",
-		"build": "pnpm build-pre && pnpm -r build && pnpm gulp",
+		"build-assets": "node ./scripts/build-assets.mjs",
+		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
-		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/index.js",
+		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
-		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/index.js",
+		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
 		"migrate": "cd packages/backend && pnpm migrate",
 		"check:connect": "cd packages/backend && pnpm check:connect",
 		"migrateandstart": "pnpm migrate && pnpm start",
-		"gulp": "pnpm exec gulp build",
 		"watch": "pnpm dev",
 		"dev": "node ./scripts/dev.mjs",
 		"lint": "pnpm -r lint",
@@ -34,7 +34,6 @@
 		"jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage",
 		"test": "pnpm -r test",
 		"test-and-coverage": "pnpm -r test-and-coverage",
-		"format": "pnpm exec gulp format",
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
 		"cleanall": "pnpm clean-all"
@@ -44,23 +43,19 @@
 		"lodash": "4.17.21"
 	},
 	"dependencies": {
-		"execa": "7.2.0",
+		"execa": "8.0.1",
-		"gulp": "4.0.2",
+		"cssnano": "6.0.1",
-		"gulp-cssnano": "2.1.3",
-		"gulp-rename": "2.0.0",
-		"gulp-replace": "1.1.4",
-		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
-		"typescript": "5.1.6"
+		"postcss": "8.4.30",
+		"terser": "5.20.0",
+		"typescript": "5.2.2"
 	},
 	"devDependencies": {
-		"@types/gulp": "4.0.13",
+		"@typescript-eslint/eslint-plugin": "6.7.2",
-		"@types/gulp-rename": "2.0.2",
+		"@typescript-eslint/parser": "6.7.2",
-		"@typescript-eslint/eslint-plugin": "6.2.0",
-		"@typescript-eslint/parser": "6.2.0",
 		"cross-env": "7.0.3",
-		"cypress": "12.17.2",
+		"cypress": "13.2.0",
-		"eslint": "8.46.0",
+		"eslint": "8.49.0",
 		"start-server-and-test": "2.0.0"
 	},
 	"optionalDependencies": {

packages/backend/.swcrc

@@ -11,7 +11,7 @@
 			"decoratorMetadata": true
 		},
 		"experimental": {
-			"keepImportAssertions": true
+			"keepImportAttributes": true
 		},
 		"baseUrl": "src",
 		"paths": {

packages/backend/migration/1665091090561-add-renote-muting.js

@@ -16,5 +16,9 @@ export class addRenoteMuting1665091090561 {
 	}
 
 	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_renote_muting_muterId"`);
+		await queryRunner.query(`DROP INDEX "IDX_renote_muting_muteeId"`);
+		await queryRunner.query(`DROP INDEX "IDX_renote_muting_createdAt"`);
+		await queryRunner.query(`DROP TABLE "renote_muting"`);
 	}
 }

packages/backend/migration/1690417561185-fix-renote-muting.js

@@ -0,0 +1,12 @@
+export class FixRenoteMuting1690417561185 {
+    name = 'FixRenoteMuting1690417561185'
+
+    async up(queryRunner) {
+      await queryRunner.query(`DELETE FROM "renote_muting" WHERE "muteeId" NOT IN (SELECT "id" FROM "user")`);
+      await queryRunner.query(`DELETE FROM "renote_muting" WHERE "muterId" NOT IN (SELECT "id" FROM "user")`);
+    }
+
+    async down(queryRunner) {
+
+    }
+}

packages/backend/migration/1690569881926-user-2fa-backup-codes.js

@@ -0,0 +1,11 @@
+export class User2faBackupCodes1690569881926 {
+	name = 'User2faBackupCodes1690569881926'
+
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" ADD "twoFactorBackupSecret" character varying array`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twoFactorBackupSecret"`);
+	}
+}

packages/backend/migration/1690796169261-play-visibility.js

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class PlayVisibility1689102832143 {
+		name = 'PlayVisibility1690796169261'
+
+		async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "public"."flash" ADD "visibility" character varying(512) DEFAULT 'public'`, undefined);
+		}
+		async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "public"."flash" DROP COLUMN "visibility"`, undefined);
+		}
+}

packages/backend/migration/1691959191872-passkey-support.js

@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class PasskeySupport1691959191872 {
+	name = 'PasskeySupport1691959191872'
+
+	async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "user_security_key" ADD "counter" bigint NOT NULL DEFAULT '0'`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."counter" IS 'The number of times the UserSecurityKey was validated.'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" ADD "credentialDeviceType" character varying(32)`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."credentialDeviceType" IS 'The type of Backup Eligibility in authenticator data'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" ADD "credentialBackedUp" boolean`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."credentialBackedUp" IS 'Whether or not the credential has been backed up'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" ADD "transports" character varying(32) array`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."transports" IS 'The type of the credential returned by the browser'`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."publicKey" IS 'The public key of the UserSecurityKey, hex-encoded.'`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."lastUsed" IS 'Timestamp of the last time the UserSecurityKey was used.'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" ALTER COLUMN "lastUsed" SET DEFAULT now()`);
+			await queryRunner.query(`UPDATE "user_security_key" SET "id" = REPLACE(REPLACE(REPLACE(REPLACE(ENCODE(DECODE("id", 'hex'), 'base64'), E'\\n', ''), '+', '-'), '/', '_'), '=', ''), "publicKey" = REPLACE(REPLACE(REPLACE(REPLACE(ENCODE(DECODE("publicKey", 'hex'), 'base64'), E'\\n', ''), '+', '-'), '/', '_'), '=', '')`);
+			await queryRunner.query(`ALTER TABLE "attestation_challenge" DROP CONSTRAINT "FK_f1a461a618fa1755692d0e0d592"`);
+			await queryRunner.query(`DROP INDEX "IDX_47efb914aed1f72dd39a306c7b"`);
+			await queryRunner.query(`DROP INDEX "IDX_f1a461a618fa1755692d0e0d59"`);
+			await queryRunner.query(`DROP TABLE "attestation_challenge"`);
+	}
+
+	async down(queryRunner) {
+			await queryRunner.query(`CREATE TABLE "attestation_challenge" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "challenge" character varying(64) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "registrationChallenge" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_d0ba6786e093f1bcb497572a6b5" PRIMARY KEY ("id", "userId"))`);
+			await queryRunner.query(`CREATE INDEX "IDX_f1a461a618fa1755692d0e0d59" ON "attestation_challenge" ("userId") `);
+			await queryRunner.query(`CREATE INDEX "IDX_47efb914aed1f72dd39a306c7b" ON "attestation_challenge" ("challenge") `);
+			await queryRunner.query(`ALTER TABLE "attestation_challenge" ADD CONSTRAINT "FK_f1a461a618fa1755692d0e0d592" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+			await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."challenge" IS 'Hex-encoded sha256 hash of the challenge.'`);
+			await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS 'The date challenge was created for expiry purposes.'`);
+			await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS 'Indicates that the challenge is only for registration purposes if true to prevent the challenge for being used as authentication.'`);
+			await queryRunner.query(`UPDATE "user_security_key" SET "id" = ENCODE(DECODE(REPLACE(REPLACE("id" || CASE WHEN LENGTH("id") % 4 = 2 THEN '==' WHEN LENGTH("id") % 4 = 3 THEN '=' ELSE '' END, '-', '+'), '_', '/'), 'base64'), 'hex'), "publicKey" = ENCODE(DECODE(REPLACE(REPLACE("publicKey" || CASE WHEN LENGTH("publicKey") % 4 = 2 THEN '==' WHEN LENGTH("publicKey") % 4 = 3 THEN '=' ELSE '' END, '-', '+'), '_', '/'), 'base64'), 'hex')`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" ALTER COLUMN "lastUsed" DROP DEFAULT`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."lastUsed" IS 'The date of the last time the UserSecurityKey was successfully validated.'`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."publicKey" IS 'Variable-length public key used to verify attestations (hex-encoded).'`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."transports" IS 'The type of the credential returned by the browser'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" DROP COLUMN "transports"`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."credentialBackedUp" IS 'Whether or not the credential has been backed up'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" DROP COLUMN "credentialBackedUp"`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."credentialDeviceType" IS 'The type of Backup Eligibility in authenticator data'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" DROP COLUMN "credentialDeviceType"`);
+			await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."counter" IS 'The number of times the UserSecurityKey was validated.'`);
+			await queryRunner.query(`ALTER TABLE "user_security_key" DROP COLUMN "counter"`);
+	}
+}

packages/backend/migration/1694850832075-server-icons-and-manifest.js

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class ServerIconsAndManifest1694850832075 {
+    name = 'ServerIconsAndManifest1694850832075'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "app192IconUrl" character varying(1024)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "app512IconUrl" character varying(1024)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "manifestJsonOverride" character varying(8192) NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "manifestJsonOverride"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "app512IconUrl"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "app192IconUrl"`);
+    }
+}

packages/backend/migration/1694915420864-clipped-count.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class ClippedCount1694915420864 {
+    name = 'ClippedCount1694915420864'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" ADD "clippedCount" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "clippedCount"`);
+    }
+}

packages/backend/migration/1695260774117-verified-links.js

@@ -0,0 +1,11 @@
+export class VerifiedLinks1695260774117 {
+    name = 'VerifiedLinks1695260774117'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "verifiedLinks" character varying array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "verifiedLinks"`);
+    }
+}

packages/backend/migration/1695288787870-following-notify.js

@@ -0,0 +1,13 @@
+export class FollowingNotify1695288787870 {
+    name = 'FollowingNotify1695288787870'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "following" ADD "notify" character varying(32)`);
+        await queryRunner.query(`CREATE INDEX "IDX_5108098457488634a4768e1d12" ON "following" ("notify") `);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`DROP INDEX "public"."IDX_5108098457488634a4768e1d12"`);
+        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "notify"`);
+    }
+}

packages/backend/package.json

@@ -56,36 +56,37 @@
 		"utf-8-validate": "^6.0.3"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.367.0",
+		"@aws-sdk/client-s3": "3.412.0",
-		"@aws-sdk/lib-storage": "3.367.0",
+		"@aws-sdk/lib-storage": "3.412.0",
-		"@aws-sdk/node-http-handler": "3.360.0",
+		"@smithy/node-http-handler": "2.1.5",
-		"@bull-board/api": "5.7.1",
+		"@bull-board/api": "5.8.4",
-		"@bull-board/fastify": "5.7.1",
+		"@bull-board/fastify": "5.8.4",
-		"@bull-board/ui": "5.7.1",
+		"@bull-board/ui": "5.8.4",
 		"@discordapp/twemoji": "14.1.2",
 		"@fastify/accepts": "4.2.0",
-		"@fastify/cookie": "8.3.0",
+		"@fastify/cookie": "9.1.0",
-		"@fastify/cors": "8.3.0",
+		"@fastify/cors": "8.4.0",
 		"@fastify/express": "2.3.0",
 		"@fastify/http-proxy": "9.2.1",
 		"@fastify/multipart": "7.7.3",
-		"@fastify/static": "6.10.2",
+		"@fastify/static": "6.11.2",
-		"@fastify/view": "8.0.0",
+		"@fastify/view": "8.2.0",
-		"@nestjs/common": "10.1.2",
+		"@nestjs/common": "10.2.5",
-		"@nestjs/core": "10.1.2",
+		"@nestjs/core": "10.2.5",
-		"@nestjs/testing": "10.1.2",
+		"@nestjs/testing": "10.2.5",
 		"@peertube/http-signature": "1.7.0",
-		"@sinonjs/fake-timers": "10.3.0",
+		"@simplewebauthn/server": "8.1.1",
+		"@sinonjs/fake-timers": "11.1.0",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.72",
+		"@swc/core": "1.3.86",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
-		"archiver": "5.3.1",
+		"archiver": "6.0.1",
-		"async-mutex": "^0.4.0",
+		"async-mutex": "0.4.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.6.3",
+		"bullmq": "4.11.2",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -96,7 +97,7 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.21.0",
+		"fastify": "4.23.2",
 		"feed": "4.2.2",
 		"file-type": "18.5.0",
 		"fluent-ffmpeg": "2.1.2",
@@ -112,17 +113,18 @@
 		"js-yaml": "4.1.0",
 		"jsdom": "22.1.0",
 		"json5": "2.2.3",
-		"jsonld": "8.2.0",
+		"jsonld": "8.3.1",
 		"jsrsasign": "10.8.6",
-		"meilisearch": "0.33.0",
+		"meilisearch": "0.34.2",
 		"mfm-js": "0.23.3",
-		"microformats-parser": "1.4.1",
+		"microformats-parser": "1.5.2",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"ms": "3.0.0-canary.1",
+		"nanoid": "5.0.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.4",
+		"nodemailer": "6.9.5",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.11.1",
@@ -130,7 +132,7 @@
 		"os-utils": "0.0.14",
 		"otpauth": "9.1.4",
 		"parse5": "7.1.2",
-		"pg": "8.11.1",
+		"pg": "8.11.3",
 		"pkce-challenge": "4.0.1",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
@@ -140,84 +142,85 @@
 		"qrcode": "1.5.3",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.20.1",
+		"re2": "1.20.3",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
 		"sanitize-html": "2.11.0",
-		"sharp": "0.32.4",
+		"sharp": "0.32.6",
 		"sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.18.9",
+		"systeminformation": "5.21.8",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
-		"tsc-alias": "1.8.7",
+		"tsc-alias": "1.8.8",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.17",
-		"typescript": "5.1.6",
+		"typescript": "5.2.2",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
-		"web-push": "3.6.4",
+		"web-push": "3.6.6",
-		"ws": "8.13.0",
+		"ws": "8.14.2",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@jest/globals": "29.6.2",
+		"@jest/globals": "29.7.0",
-		"@swc/jest": "0.2.27",
+		"@simplewebauthn/typescript-types": "8.0.0",
+		"@swc/jest": "0.2.29",
 		"@types/accepts": "1.3.5",
 		"@types/archiver": "5.3.2",
-		"@types/bcryptjs": "2.4.2",
+		"@types/bcryptjs": "2.4.4",
-		"@types/body-parser": "1.19.2",
+		"@types/body-parser": "1.19.3",
 		"@types/cbor": "6.0.0",
-		"@types/color-convert": "2.0.0",
+		"@types/color-convert": "2.0.1",
-		"@types/content-disposition": "0.5.5",
+		"@types/content-disposition": "0.5.6",
-		"@types/fluent-ffmpeg": "2.1.21",
+		"@types/fluent-ffmpeg": "2.1.22",
 		"@types/http-link-header": "1.0.3",
-		"@types/jest": "29.5.3",
+		"@types/jest": "29.5.5",
-		"@types/js-yaml": "4.0.5",
+		"@types/js-yaml": "4.0.6",
-		"@types/jsdom": "21.1.1",
+		"@types/jsdom": "21.1.3",
-		"@types/jsonld": "1.5.9",
+		"@types/jsonld": "1.5.10",
-		"@types/jsrsasign": "10.5.8",
+		"@types/jsrsasign": "10.5.9",
 		"@types/mime-types": "2.1.1",
 		"@types/ms": "0.7.31",
-		"@types/node": "20.4.5",
+		"@types/node": "20.6.3",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.9",
+		"@types/nodemailer": "6.4.10",
-		"@types/oauth": "0.9.1",
+		"@types/oauth": "0.9.2",
-		"@types/oauth2orize": "1.11.0",
+		"@types/oauth2orize": "1.11.1",
 		"@types/oauth2orize-pkce": "0.1.0",
 		"@types/pg": "8.10.2",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.5.1",
+		"@types/qrcode": "1.5.2",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.9.0",
-		"@types/semver": "7.5.0",
+		"@types/semver": "7.5.2",
 		"@types/sharp": "0.32.0",
 		"@types/simple-oauth2": "5.0.4",
 		"@types/sinonjs__fake-timers": "8.1.2",
-		"@types/tinycolor2": "1.4.3",
+		"@types/tinycolor2": "1.4.4",
-		"@types/tmp": "0.2.3",
+		"@types/tmp": "0.2.4",
 		"@types/vary": "1.1.0",
-		"@types/web-push": "3.3.2",
+		"@types/web-push": "3.6.0",
 		"@types/ws": "8.5.5",
-		"@typescript-eslint/eslint-plugin": "6.2.0",
+		"@typescript-eslint/eslint-plugin": "6.7.2",
-		"@typescript-eslint/parser": "6.2.0",
+		"@typescript-eslint/parser": "6.7.2",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.46.0",
+		"eslint": "8.49.0",
-		"eslint-plugin-import": "2.28.0",
+		"eslint-plugin-import": "2.28.1",
-		"execa": "7.2.0",
+		"execa": "8.0.1",
-		"jest": "29.6.2",
+		"jest": "29.7.0",
-		"jest-mock": "29.6.2",
+		"jest-mock": "29.7.0",
 		"simple-oauth2": "5.0.0"
 	}
 }

packages/backend/src/boot/common.ts

@@ -8,7 +8,6 @@ import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
 import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
 import { NestLogger } from '@/NestLogger.js';
 import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
-import { JanitorService } from '@/daemons/JanitorService.js';
 import { QueueStatsService } from '@/daemons/QueueStatsService.js';
 import { ServerStatsService } from '@/daemons/ServerStatsService.js';
 import { ServerService } from '@/server/ServerService.js';
@@ -25,7 +24,6 @@ export async function server() {
 
 	if (process.env.NODE_ENV !== 'test') {
 		app.get(ChartManagementService).start();
-		app.get(JanitorService).start();
 		app.get(QueueStatsService).start();
 		app.get(ServerStatsService).start();
 	}

packages/backend/src/boot/master.ts

@@ -68,21 +68,34 @@ export async function masterMain() {
 		process.exit(1);
 	}
 
-	if (envOption.onlyServer) {
-		await server();
-	} else if (envOption.onlyQueue) {
-		await jobQueue();
-	} else {
-		await server();
-	}
-
 	bootLogger.succ('Misskey initialized');
 
-	if (!envOption.disableClustering) {
+	if (envOption.disableClustering) {
+		if (envOption.onlyServer) {
+			await server();
+		} else if (envOption.onlyQueue) {
+			await jobQueue();
+		} else {
+			await server();
+			await jobQueue();
+		}
+	} else {
+		if (envOption.onlyServer) {
+			// nop
+		} else if (envOption.onlyQueue) {
+			// nop
+		} else {
+			await server();
+		}
+
 		await spawnWorkers(config.clusterLimit);
 	}
 
-	bootLogger.succ(config.socket ? `Now listening on socket ${config.socket} on ${config.url}` : `Now listening on port ${config.port} on ${config.url}`, null, true);
+	if (envOption.onlyQueue) {
+		bootLogger.succ('Queue started', null, true);
+	} else {
+		bootLogger.succ(config.socket ? `Now listening on socket ${config.socket} on ${config.url}` : `Now listening on port ${config.port} on ${config.url}`, null, true);
+	}
 }
 
 function showEnvironment(): void {

packages/backend/src/config.ts

@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-/**
- * Config loader
- */
-
 import * as fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, resolve } from 'node:path';
@@ -23,11 +19,9 @@ type RedisOptionsSource = Partial<RedisOptions> & {
 };
 
 /**
- * ユーザーが設定する必要のある情報
+ * 設定ファイルの型
  */
-export type Source = {
+type Source = {
-	repository_url?: string;
-	feedback_url?: string;
 	url: string;
 	port?: number;
 	socket?: string;
@@ -70,12 +64,11 @@ export type Source = {
 
 	maxFileSize?: number;
 
-	accesslog?: string;
-
 	clusterLimit?: number;
 
 	id: string;
 
+	outgoingAddress?: string;
 	outgoingAddressFamily?: 'ipv4' | 'ipv6' | 'dual';
 
 	deliverJobConcurrency?: number;
@@ -92,12 +85,63 @@ export type Source = {
 	videoThumbnailGenerator?: string;
 
 	signToActivityPubGet?: boolean;
+
+	perChannelMaxNoteCacheCount?: number;
+	perUserNotificationsMaxCount?: number;
+	deactivateAntennaThreshold?: number;
 };
 
-/**
+export type Config = {
- * Misskeyが自動的に(ユーザーが設定した情報から推論して)設定する情報
+	url: string;
- */
+	port: number;
-export type Mixin = {
+	socket: string | undefined;
+	chmodSocket: string | undefined;
+	disableHsts: boolean | undefined;
+	db: {
+		host: string;
+		port: number;
+		db: string;
+		user: string;
+		pass: string;
+		disableCache?: boolean;
+		extra?: { [x: string]: string };
+	};
+	dbReplications: boolean | undefined;
+	dbSlaves: {
+		host: string;
+		port: number;
+		db: string;
+		user: string;
+		pass: string;
+	}[] | undefined;
+	meilisearch: {
+		host: string;
+		port: string;
+		apiKey: string;
+		ssl?: boolean;
+		index: string;
+		scope?: 'local' | 'global' | string[];
+	} | undefined;
+	proxy: string | undefined;
+	proxySmtp: string | undefined;
+	proxyBypassHosts: string[] | undefined;
+	allowedPrivateNetworks: string[] | undefined;
+	maxFileSize: number | undefined;
+	clusterLimit: number | undefined;
+	id: string;
+	outgoingAddress: string | undefined;
+	outgoingAddressFamily: 'ipv4' | 'ipv6' | 'dual' | undefined;
+	deliverJobConcurrency: number | undefined;
+	inboxJobConcurrency: number | undefined;
+	relashionshipJobConcurrency: number | undefined;
+	deliverJobPerSec: number | undefined;
+	inboxJobPerSec: number | undefined;
+	relashionshipJobPerSec: number | undefined;
+	deliverJobMaxAttempts: number | undefined;
+	inboxJobMaxAttempts: number | undefined;
+	proxyRemoteFiles: boolean | undefined;
+	signToActivityPubGet: boolean | undefined;
+
 	version: string;
 	host: string;
 	hostname: string;
@@ -116,10 +160,11 @@ export type Mixin = {
 	redis: RedisOptions & RedisOptionsSource;
 	redisForPubsub: RedisOptions & RedisOptionsSource;
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
+	perChannelMaxNoteCacheCount: number;
+	perUserNotificationsMaxCount: number;
+	deactivateAntennaThreshold: number;
 };
 
-export type Config = Source & Mixin;
-
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
@@ -137,7 +182,7 @@ const path = process.env.MISSKEY_CONFIG_YML
 		? resolve(dir, 'test.yml')
 		: resolve(dir, 'default.yml');
 
-export function loadConfig() {
+export function loadConfig(): Config {
 	const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
 	const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json');
 	const clientManifest = clientManifestExists ?
@@ -145,43 +190,72 @@ export function loadConfig() {
 		: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
 	const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
 
-	const mixin = {} as Mixin;
-
 	const url = tryCreateUrl(config.url);
-
+	const version = meta.version;
-	config.url = url.origin;
+	const host = url.host;
-
+	const hostname = url.hostname;
-	config.port = config.port ?? parseInt(process.env.PORT ?? '', 10);
+	const scheme = url.protocol.replace(/:$/, '');
-
+	const wsScheme = scheme.replace('http', 'ws');
-	mixin.version = meta.version;
-	mixin.host = url.host;
-	mixin.hostname = url.hostname;
-	mixin.scheme = url.protocol.replace(/:$/, '');
-	mixin.wsScheme = mixin.scheme.replace('http', 'ws');
-	mixin.wsUrl = `${mixin.wsScheme}://${mixin.host}`;
-	mixin.apiUrl = `${mixin.scheme}://${mixin.host}/api`;
-	mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
-	mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
-	mixin.userAgent = `Misskey/${meta.version} (${config.url})`;
-	mixin.clientEntry = clientManifest['src/_boot_.ts'];
-	mixin.clientManifestExists = clientManifestExists;
 
 	const externalMediaProxy = config.mediaProxy ?
 		config.mediaProxy.endsWith('/') ? config.mediaProxy.substring(0, config.mediaProxy.length - 1) : config.mediaProxy
 		: null;
-	const internalMediaProxy = `${mixin.scheme}://${mixin.host}/proxy`;
+	const internalMediaProxy = `${scheme}://${host}/proxy`;
-	mixin.mediaProxy = externalMediaProxy ?? internalMediaProxy;
+	const redis = convertRedisOptions(config.redis, host);
-	mixin.externalMediaProxyEnabled = externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy;
 
-	mixin.videoThumbnailGenerator = config.videoThumbnailGenerator ?
+	return {
-		config.videoThumbnailGenerator.endsWith('/') ? config.videoThumbnailGenerator.substring(0, config.videoThumbnailGenerator.length - 1) : config.videoThumbnailGenerator
+		version,
-		: null;
+		url: url.origin,
-
+		port: config.port ?? parseInt(process.env.PORT ?? '', 10),
-	mixin.redis = convertRedisOptions(config.redis, mixin.host);
+		socket: config.socket,
-	mixin.redisForPubsub = config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, mixin.host) : mixin.redis;
+		chmodSocket: config.chmodSocket,
-	mixin.redisForJobQueue = config.redisForJobQueue ? convertRedisOptions(config.redisForJobQueue, mixin.host) : mixin.redis;
+		disableHsts: config.disableHsts,
-
+		host,
-	return Object.assign(config, mixin);
+		hostname,
+		scheme,
+		wsScheme,
+		wsUrl: `${wsScheme}://${host}`,
+		apiUrl: `${scheme}://${host}/api`,
+		authUrl: `${scheme}://${host}/auth`,
+		driveUrl: `${scheme}://${host}/files`,
+		db: config.db,
+		dbReplications: config.dbReplications,
+		dbSlaves: config.dbSlaves,
+		meilisearch: config.meilisearch,
+		redis,
+		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
+		redisForJobQueue: config.redisForJobQueue ? convertRedisOptions(config.redisForJobQueue, host) : redis,
+		id: config.id,
+		proxy: config.proxy,
+		proxySmtp: config.proxySmtp,
+		proxyBypassHosts: config.proxyBypassHosts,
+		allowedPrivateNetworks: config.allowedPrivateNetworks,
+		maxFileSize: config.maxFileSize,
+		clusterLimit: config.clusterLimit,
+		outgoingAddress: config.outgoingAddress,
+		outgoingAddressFamily: config.outgoingAddressFamily,
+		deliverJobConcurrency: config.deliverJobConcurrency,
+		inboxJobConcurrency: config.inboxJobConcurrency,
+		relashionshipJobConcurrency: config.relashionshipJobConcurrency,
+		deliverJobPerSec: config.deliverJobPerSec,
+		inboxJobPerSec: config.inboxJobPerSec,
+		relashionshipJobPerSec: config.relashionshipJobPerSec,
+		deliverJobMaxAttempts: config.deliverJobMaxAttempts,
+		inboxJobMaxAttempts: config.inboxJobMaxAttempts,
+		proxyRemoteFiles: config.proxyRemoteFiles,
+		signToActivityPubGet: config.signToActivityPubGet,
+		mediaProxy: externalMediaProxy ?? internalMediaProxy,
+		externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,
+		videoThumbnailGenerator: config.videoThumbnailGenerator ?
+			config.videoThumbnailGenerator.endsWith('/') ? config.videoThumbnailGenerator.substring(0, config.videoThumbnailGenerator.length - 1) : config.videoThumbnailGenerator
+			: null,
+		userAgent: `Misskey/${version} (${config.url})`,
+		clientEntry: clientManifest['src/_boot_.ts'],
+		clientManifestExists: clientManifestExists,
+		perChannelMaxNoteCacheCount: config.perChannelMaxNoteCacheCount ?? 1000,
+		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 300,
+		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
+	};
 }
 
 function tryCreateUrl(url: string) {

packages/backend/src/core/AccountMoveService.ts

@@ -8,8 +8,8 @@ import { IsNull, In, MoreThan, Not } from 'typeorm';
 
 import { bindThis } from '@/decorators.js';
 import { DI } from '@/di-symbols.js';
-import type { LocalUser, RemoteUser, User } from '@/models/entities/User.js';
+import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
-import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListJoiningsRepository, UsersRepository } from '@/models/index.js';
+import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListJoiningsRepository, UsersRepository } from '@/models/_.js';
 import type { RelationshipJobData, ThinUser } from '@/queue/types.js';
 
 import { IdService } from '@/core/IdService.js';
@@ -71,12 +71,12 @@ export class AccountMoveService {
 	 * After delivering Move activity, its local followers unfollow the old account and then follow the new one.
 	 */
 	@bindThis
-	public async moveFromLocal(src: LocalUser, dst: LocalUser | RemoteUser): Promise<unknown> {
+	public async moveFromLocal(src: MiLocalUser, dst: MiLocalUser | MiRemoteUser): Promise<unknown> {
 		const srcUri = this.userEntityService.getUserUri(src);
 		const dstUri = this.userEntityService.getUserUri(dst);
 
 		// add movedToUri to indicate that the user has moved
-		const update = {} as Partial<LocalUser>;
+		const update = {} as Partial<MiLocalUser>;
 		update.alsoKnownAs = src.alsoKnownAs?.includes(dstUri) ? src.alsoKnownAs : src.alsoKnownAs?.concat([dstUri]) ?? [dstUri];
 		update.movedToUri = dstUri;
 		update.movedAt = new Date();
@@ -114,7 +114,7 @@ export class AccountMoveService {
 	}
 
 	@bindThis
-	public async postMoveProcess(src: User, dst: User): Promise<void> {
+	public async postMoveProcess(src: MiUser, dst: MiUser): Promise<void> {
 		// Copy blockings and mutings, and update lists
 		try {
 			await Promise.all([
@@ -213,7 +213,7 @@ export class AccountMoveService {
 	 * @returns Promise<void>
 	 */
 	@bindThis
-	public async updateLists(src: ThinUser, dst: User): Promise<void> {
+	public async updateLists(src: ThinUser, dst: MiUser): Promise<void> {
 		// Return if there is no list to be updated.
 		const oldJoinings = await this.userListJoiningsRepository.find({
 			where: {
@@ -260,7 +260,7 @@ export class AccountMoveService {
 	}
 
 	@bindThis
-	private async adjustFollowingCounts(localFollowerIds: string[], oldAccount: User): Promise<void> {
+	private async adjustFollowingCounts(localFollowerIds: string[], oldAccount: MiUser): Promise<void> {
 		if (localFollowerIds.length === 0) return;
 
 		// Set the old account's following and followers counts to 0.
@@ -301,11 +301,11 @@ export class AccountMoveService {
 	 */
 	@bindThis
 	public async validateAlsoKnownAs(
-		dst: LocalUser | RemoteUser,
+		dst: MiLocalUser | MiRemoteUser,
-		check: (oldUser: LocalUser | RemoteUser | null, newUser: LocalUser | RemoteUser) => boolean | Promise<boolean> = () => true,
+		check: (oldUser: MiLocalUser | MiRemoteUser | null, newUser: MiLocalUser | MiRemoteUser) => boolean | Promise<boolean> = () => true,
 		instant = false,
-	): Promise<LocalUser | RemoteUser | null> {
+	): Promise<MiLocalUser | MiRemoteUser | null> {
-		let resultUser: LocalUser | RemoteUser | null = null;
+		let resultUser: MiLocalUser | MiRemoteUser | null = null;
 
 		if (this.userEntityService.isRemoteUser(dst)) {
 			if ((new Date()).getTime() - (dst.lastFetchedAt?.getTime() ?? 0) > 10 * 1000) {

packages/backend/src/core/AccountUpdateService.ts

@@ -5,8 +5,8 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { UsersRepository } from '@/models/index.js';
+import type { UsersRepository } from '@/models/_.js';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/User.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { RelayService } from '@/core/RelayService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
@@ -27,7 +27,7 @@ export class AccountUpdateService {
 	}
 
 	@bindThis
-	public async publishToFollowers(userId: User['id']) {
+	public async publishToFollowers(userId: MiUser['id']) {
 		const user = await this.usersRepository.findOneBy({ id: userId });
 		if (user == null) throw new Error('user not found');
 

packages/backend/src/core/AchievementService.ts

@@ -4,8 +4,8 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import type { UserProfilesRepository } from '@/models/index.js';
+import type { UserProfilesRepository } from '@/models/_.js';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/User.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { NotificationService } from '@/core/NotificationService.js';
@@ -85,6 +85,7 @@ export const ACHIEVEMENT_TYPES = [
 	'setNameToSyuilo',
 	'cookieClicked',
 	'brainDiver',
+	'smashTestNotificationButton',
 ] as const;
 
 @Injectable()
@@ -99,7 +100,7 @@ export class AchievementService {
 
 	@bindThis
 	public async create(
-		userId: User['id'],
+		userId: MiUser['id'],
 		type: typeof ACHIEVEMENT_TYPES[number],
 	): Promise<void> {
 		if (!ACHIEVEMENT_TYPES.includes(type)) return;

packages/backend/src/core/AnnouncementService.ts

@@ -6,8 +6,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Brackets } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/User.js';
-import type { AnnouncementReadsRepository, AnnouncementsRepository, Announcement, AnnouncementRead } from '@/models/index.js';
+import type { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, MiAnnouncementRead } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { Packed } from '@/misc/json-schema.js';
 import { IdService } from '@/core/IdService.js';
@@ -28,14 +28,14 @@ export class AnnouncementService {
 	}
 
 	@bindThis
-	public async getReads(userId: User['id']): Promise<AnnouncementRead[]> {
+	public async getReads(userId: MiUser['id']): Promise<MiAnnouncementRead[]> {
 		return this.announcementReadsRepository.findBy({
 			userId: userId,
 		});
 	}
 
 	@bindThis
-	public async getUnreadAnnouncements(user: User): Promise<Announcement[]> {
+	public async getUnreadAnnouncements(user: MiUser): Promise<MiAnnouncement[]> {
 		const readsQuery = this.announcementReadsRepository.createQueryBuilder('read')
 			.select('read.announcementId')
 			.where('read.userId = :userId', { userId: user.id });
@@ -58,7 +58,7 @@ export class AnnouncementService {
 	}
 
 	@bindThis
-	public async create(values: Partial<Announcement>): Promise<{ raw: Announcement; packed: Packed<'Announcement'> }> {
+	public async create(values: Partial<MiAnnouncement>): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
 		const announcement = await this.announcementsRepository.insert({
 			id: this.idService.genId(),
 			createdAt: new Date(),
@@ -92,7 +92,7 @@ export class AnnouncementService {
 	}
 
 	@bindThis
-	public async read(user: User, announcementId: Announcement['id']): Promise<void> {
+	public async read(user: MiUser, announcementId: MiAnnouncement['id']): Promise<void> {
 		try {
 			await this.announcementReadsRepository.insert({
 				id: this.idService.genId(),
@@ -111,10 +111,10 @@ export class AnnouncementService {
 
 	@bindThis
 	public async packMany(
-		announcements: Announcement[],
+		announcements: MiAnnouncement[],
-		me?: { id: User['id'] } | null | undefined,
+		me?: { id: MiUser['id'] } | null | undefined,
 		options?: {
-			reads?: AnnouncementRead[];
+			reads?: MiAnnouncementRead[];
 		},
 	): Promise<Packed<'Announcement'>[]> {
 		const reads = me ? (options?.reads ?? await this.getReads(me.id)) : [];

packages/backend/src/core/AntennaService.ts

@@ -5,14 +5,14 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { Antenna } from '@/models/entities/Antenna.js';
+import type { MiAntenna } from '@/models/Antenna.js';
-import type { Note } from '@/models/entities/Note.js';
+import type { MiNote } from '@/models/Note.js';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/User.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import * as Acct from '@/misc/acct.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
-import type { AntennasRepository, UserListJoiningsRepository } from '@/models/index.js';
+import type { AntennasRepository, UserListJoiningsRepository } from '@/models/_.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { StreamMessages } from '@/server/api/stream/types.js';
@@ -21,7 +21,7 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 @Injectable()
 export class AntennaService implements OnApplicationShutdown {
 	private antennasFetched: boolean;
-	private antennas: Antenna[];
+	private antennas: MiAntenna[];
 
 	constructor(
 		@Inject(DI.redis)
@@ -76,7 +76,7 @@ export class AntennaService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async addNoteToAntennas(note: Note, noteUser: { id: User['id']; username: string; host: string | null; }): Promise<void> {
+	public async addNoteToAntennas(note: MiNote, noteUser: { id: MiUser['id']; username: string; host: string | null; }): Promise<void> {
 		const antennas = await this.getAntennas();
 		const antennasWithMatchResult = await Promise.all(antennas.map(antenna => this.checkHitAntenna(antenna, note, noteUser).then(hit => [antenna, hit] as const)));
 		const matchedAntennas = antennasWithMatchResult.filter(([, hit]) => hit).map(([antenna]) => antenna);
@@ -99,7 +99,7 @@ export class AntennaService implements OnApplicationShutdown {
 	// NOTE: フォローしているユーザーのノート、リストのユーザーのノート、グループのユーザーのノート指定はパフォーマンス上の理由で無効になっている
 
 	@bindThis
-	public async checkHitAntenna(antenna: Antenna, note: (Note | Packed<'Note'>), noteUser: { id: User['id']; username: string; host: string | null; }): Promise<boolean> {
+	public async checkHitAntenna(antenna: MiAntenna, note: (MiNote | Packed<'Note'>), noteUser: { id: MiUser['id']; username: string; host: string | null; }): Promise<boolean> {
 		if (note.visibility === 'specified') return false;
 		if (note.visibility === 'followers') return false;
 

packages/backend/src/core/CacheService.ts

@@ -5,9 +5,9 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, UserProfile, UserProfilesRepository, UsersRepository } from '@/models/index.js';
+import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository } from '@/models/_.js';
 import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
-import type { LocalUser, User } from '@/models/entities/User.js';
+import type { MiLocalUser, MiUser } from '@/models/User.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
@@ -16,11 +16,11 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
 export class CacheService implements OnApplicationShutdown {
-	public userByIdCache: MemoryKVCache<User, User | string>;
+	public userByIdCache: MemoryKVCache<MiUser, MiUser | string>;
-	public localUserByNativeTokenCache: MemoryKVCache<LocalUser | null, string | null>;
+	public localUserByNativeTokenCache: MemoryKVCache<MiLocalUser | null, string | null>;
-	public localUserByIdCache: MemoryKVCache<LocalUser>;
+	public localUserByIdCache: MemoryKVCache<MiLocalUser>;
-	public uriPersonCache: MemoryKVCache<User | null, string | null>;
+	public uriPersonCache: MemoryKVCache<MiUser | null, string | null>;
-	public userProfileCache: RedisKVCache<UserProfile>;
+	public userProfileCache: RedisKVCache<MiUserProfile>;
 	public userMutingsCache: RedisKVCache<Set<string>>;
 	public userBlockingCache: RedisKVCache<Set<string>>;
 	public userBlockedCache: RedisKVCache<Set<string>>; // NOTE: 「被」Blockキャッシュ
@@ -60,14 +60,14 @@ export class CacheService implements OnApplicationShutdown {
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
-		const localUserByIdCache = new MemoryKVCache<LocalUser>(1000 * 60 * 60 * 6 /* 6h */);
+		const localUserByIdCache = new MemoryKVCache<MiLocalUser>(1000 * 60 * 60 * 6 /* 6h */);
 		this.localUserByIdCache	= localUserByIdCache;
 
 		// ローカルユーザーならlocalUserByIdCacheにデータを追加し、こちらにはid(文字列)だけを追加する
-		const userByIdCache = new MemoryKVCache<User, User | string>(1000 * 60 * 60 * 6 /* 6h */, {
+		const userByIdCache = new MemoryKVCache<MiUser, MiUser | string>(1000 * 60 * 60 * 6 /* 6h */, {
 			toMapConverter: user => {
 				if (user.host === null) {
-					localUserByIdCache.set(user.id, user as LocalUser);
+					localUserByIdCache.set(user.id, user as MiLocalUser);
 					return user.id;
 				}
 
@@ -77,7 +77,7 @@ export class CacheService implements OnApplicationShutdown {
 		});
 		this.userByIdCache = userByIdCache;
 
-		this.localUserByNativeTokenCache = new MemoryKVCache<LocalUser | null, string | null>(Infinity, {
+		this.localUserByNativeTokenCache = new MemoryKVCache<MiLocalUser | null, string | null>(Infinity, {
 			toMapConverter: user => {
 				if (user === null) return null;
 
@@ -86,7 +86,7 @@ export class CacheService implements OnApplicationShutdown {
 			},
 			fromMapConverter: id => id === null ? null : localUserByIdCache.get(id),
 		});
-		this.uriPersonCache = new MemoryKVCache<User | null, string | null>(Infinity, {
+		this.uriPersonCache = new MemoryKVCache<MiUser | null, string | null>(Infinity, {
 			toMapConverter: user => {
 				if (user === null) return null;
 
@@ -96,7 +96,7 @@ export class CacheService implements OnApplicationShutdown {
 			fromMapConverter: id => id === null ? null : userByIdCache.get(id),
 		});
 
-		this.userProfileCache = new RedisKVCache<UserProfile>(this.redisClient, 'userProfile', {
+		this.userProfileCache = new RedisKVCache<MiUserProfile>(this.redisClient, 'userProfile', {
 			lifetime: 1000 * 60 * 30, // 30m
 			memoryCacheLifetime: 1000 * 60, // 1m
 			fetcher: (key) => this.userProfilesRepository.findOneByOrFail({ userId: key }),
@@ -178,7 +178,7 @@ export class CacheService implements OnApplicationShutdown {
 					break;
 				}
 				case 'userTokenRegenerated': {
-					const user = await this.usersRepository.findOneByOrFail({ id: body.id }) as LocalUser;
+					const user = await this.usersRepository.findOneByOrFail({ id: body.id }) as MiLocalUser;
 					this.localUserByNativeTokenCache.delete(body.oldToken);
 					this.localUserByNativeTokenCache.set(body.newToken, user);
 					break;
@@ -197,7 +197,7 @@ export class CacheService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public findUserById(userId: User['id']) {
+	public findUserById(userId: MiUser['id']) {
 		return this.userByIdCache.fetch(userId, () => this.usersRepository.findOneByOrFail({ id: userId }));
 	}
 

packages/backend/src/core/ClipService.ts

@@ -0,0 +1,159 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { QueryFailedError } from 'typeorm';
+import { DI } from '@/di-symbols.js';
+import type { ClipsRepository, MiNote, MiClip, ClipNotesRepository, NotesRepository } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
+import { RoleService } from '@/core/RoleService.js';
+import { IdService } from '@/core/IdService.js';
+import type { MiLocalUser } from '@/models/User.js';
+
+@Injectable()
+export class ClipService {
+	public static NoSuchNoteError = class extends Error {};
+	public static NoSuchClipError = class extends Error {};
+	public static AlreadyAddedError = class extends Error {};
+	public static TooManyClipNotesError = class extends Error {};
+	public static TooManyClipsError = class extends Error {};
+
+	constructor(
+		@Inject(DI.clipsRepository)
+		private clipsRepository: ClipsRepository,
+
+		@Inject(DI.clipNotesRepository)
+		private clipNotesRepository: ClipNotesRepository,
+
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
+		private roleService: RoleService,
+		private idService: IdService,
+	) {
+	}
+
+	@bindThis
+	public async create(me: MiLocalUser, name: string, isPublic: boolean, description: string | null): Promise<MiClip> {
+		const currentCount = await this.clipsRepository.countBy({
+			userId: me.id,
+		});
+		if (currentCount > (await this.roleService.getUserPolicies(me.id)).clipLimit) {
+			throw new ClipService.TooManyClipsError();
+		}
+
+		const clip = await this.clipsRepository.insert({
+			id: this.idService.genId(),
+			createdAt: new Date(),
+			userId: me.id,
+			name: name,
+			isPublic: isPublic,
+			description: description,
+		}).then(x => this.clipsRepository.findOneByOrFail(x.identifiers[0]));
+
+		return clip;
+	}
+
+	@bindThis
+	public async update(me: MiLocalUser, clipId: MiClip['id'], name: string | undefined, isPublic: boolean | undefined, description: string | null | undefined): Promise<void> {
+		const clip = await this.clipsRepository.findOneBy({
+			id: clipId,
+			userId: me.id,
+		});
+
+		if (clip == null) {
+			throw new ClipService.NoSuchClipError();
+		}
+
+		await this.clipsRepository.update(clip.id, {
+			name: name,
+			description: description,
+			isPublic: isPublic,
+		});
+	}
+
+	@bindThis
+	public async delete(me: MiLocalUser, clipId: MiClip['id']): Promise<void> {
+		const clip = await this.clipsRepository.findOneBy({
+			id: clipId,
+			userId: me.id,
+		});
+
+		if (clip == null) {
+			throw new ClipService.NoSuchClipError();
+		}
+
+		await this.clipsRepository.delete(clip.id);
+	}
+
+	@bindThis
+	public async addNote(me: MiLocalUser, clipId: MiClip['id'], noteId: MiNote['id']): Promise<void> {
+		const clip = await this.clipsRepository.findOneBy({
+			id: clipId,
+			userId: me.id,
+		});
+
+		if (clip == null) {
+			throw new ClipService.NoSuchClipError();
+		}
+
+		const currentCount = await this.clipNotesRepository.countBy({
+			clipId: clip.id,
+		});
+		if (currentCount > (await this.roleService.getUserPolicies(me.id)).noteEachClipsLimit) {
+			throw new ClipService.TooManyClipNotesError();
+		}
+
+		try {
+			await this.clipNotesRepository.insert({
+				id: this.idService.genId(),
+				noteId: noteId,
+				clipId: clip.id,
+			});
+		} catch (e: unknown) {
+			if (e instanceof QueryFailedError) {
+				if (isDuplicateKeyValueError(e)) {
+					throw new ClipService.AlreadyAddedError();
+				} else if (e.driverError.detail.includes('is not present in table "note".')) {
+					throw new ClipService.NoSuchNoteError();
+				}
+			}
+
+			throw e;
+		}
+
+		this.clipsRepository.update(clip.id, {
+			lastClippedAt: new Date(),
+		});
+
+		this.notesRepository.increment({ id: noteId }, 'clippedCount', 1);
+	}
+
+	@bindThis
+	public async removeNote(me: MiLocalUser, clipId: MiClip['id'], noteId: MiNote['id']): Promise<void> {
+		const clip = await this.clipsRepository.findOneBy({
+			id: clipId,
+			userId: me.id,
+		});
+
+		if (clip == null) {
+			throw new ClipService.NoSuchClipError();
+		}
+
+		const note = await this.notesRepository.findOneBy({ id: noteId });
+
+		if (note == null) {
+			throw new ClipService.NoSuchNoteError();
+		}
+
+		await this.clipNotesRepository.delete({
+			noteId: noteId,
+			clipId: clip.id,
+		});
+
+		this.notesRepository.decrement({ id: noteId }, 'clippedCount', 1);
+	}
+}

packages/backend/src/core/CoreModule.ts

@@ -43,7 +43,7 @@ import { RelayService } from './RelayService.js';
 import { RoleService } from './RoleService.js';
 import { S3Service } from './S3Service.js';
 import { SignupService } from './SignupService.js';
-import { TwoFactorAuthenticationService } from './TwoFactorAuthenticationService.js';
+import { WebAuthnService } from './WebAuthnService.js';
 import { UserBlockingService } from './UserBlockingService.js';
 import { CacheService } from './CacheService.js';
 import { UserFollowingService } from './UserFollowingService.js';
@@ -51,12 +51,14 @@ import { UserKeypairService } from './UserKeypairService.js';
 import { UserListService } from './UserListService.js';
 import { UserMutingService } from './UserMutingService.js';
 import { UserSuspendService } from './UserSuspendService.js';
+import { UserAuthService } from './UserAuthService.js';
 import { VideoProcessingService } from './VideoProcessingService.js';
 import { WebhookService } from './WebhookService.js';
 import { ProxyAccountService } from './ProxyAccountService.js';
 import { UtilityService } from './UtilityService.js';
 import { FileInfoService } from './FileInfoService.js';
 import { SearchService } from './SearchService.js';
+import { ClipService } from './ClipService.js';
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
 import NotesChart from './chart/charts/notes.js';
@@ -168,7 +170,7 @@ const $RelayService: Provider = { provide: 'RelayService', useExisting: RelaySer
 const $RoleService: Provider = { provide: 'RoleService', useExisting: RoleService };
 const $S3Service: Provider = { provide: 'S3Service', useExisting: S3Service };
 const $SignupService: Provider = { provide: 'SignupService', useExisting: SignupService };
-const $TwoFactorAuthenticationService: Provider = { provide: 'TwoFactorAuthenticationService', useExisting: TwoFactorAuthenticationService };
+const $WebAuthnService: Provider = { provide: 'WebAuthnService', useExisting: WebAuthnService };
 const $UserBlockingService: Provider = { provide: 'UserBlockingService', useExisting: UserBlockingService };
 const $CacheService: Provider = { provide: 'CacheService', useExisting: CacheService };
 const $UserFollowingService: Provider = { provide: 'UserFollowingService', useExisting: UserFollowingService };
@@ -176,11 +178,13 @@ const $UserKeypairService: Provider = { provide: 'UserKeypairService', useExisti
 const $UserListService: Provider = { provide: 'UserListService', useExisting: UserListService };
 const $UserMutingService: Provider = { provide: 'UserMutingService', useExisting: UserMutingService };
 const $UserSuspendService: Provider = { provide: 'UserSuspendService', useExisting: UserSuspendService };
+const $UserAuthService: Provider = { provide: 'UserAuthService', useExisting: UserAuthService };
 const $VideoProcessingService: Provider = { provide: 'VideoProcessingService', useExisting: VideoProcessingService };
 const $WebhookService: Provider = { provide: 'WebhookService', useExisting: WebhookService };
 const $UtilityService: Provider = { provide: 'UtilityService', useExisting: UtilityService };
 const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: FileInfoService };
 const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
+const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -296,7 +300,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		RoleService,
 		S3Service,
 		SignupService,
-		TwoFactorAuthenticationService,
+		WebAuthnService,
 		UserBlockingService,
 		CacheService,
 		UserFollowingService,
@@ -304,11 +308,13 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserListService,
 		UserMutingService,
 		UserSuspendService,
+		UserAuthService,
 		VideoProcessingService,
 		WebhookService,
 		UtilityService,
 		FileInfoService,
 		SearchService,
+		ClipService,
 		ChartLoggerService,
 		FederationChart,
 		NotesChart,
@@ -417,7 +423,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$RoleService,
 		$S3Service,
 		$SignupService,
-		$TwoFactorAuthenticationService,
+		$WebAuthnService,
 		$UserBlockingService,
 		$CacheService,
 		$UserFollowingService,
@@ -425,11 +431,13 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$UserListService,
 		$UserMutingService,
 		$UserSuspendService,
+		$UserAuthService,
 		$VideoProcessingService,
 		$WebhookService,
 		$UtilityService,
 		$FileInfoService,
 		$SearchService,
+		$ClipService,
 		$ChartLoggerService,
 		$FederationChart,
 		$NotesChart,
@@ -539,7 +547,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		RoleService,
 		S3Service,
 		SignupService,
-		TwoFactorAuthenticationService,
+		WebAuthnService,
 		UserBlockingService,
 		CacheService,
 		UserFollowingService,
@@ -547,11 +555,13 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserListService,
 		UserMutingService,
 		UserSuspendService,
+		UserAuthService,
 		VideoProcessingService,
 		WebhookService,
 		UtilityService,
 		FileInfoService,
 		SearchService,
+		ClipService,
 		FederationChart,
 		NotesChart,
 		UsersChart,
@@ -659,7 +669,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$RoleService,
 		$S3Service,
 		$SignupService,
-		$TwoFactorAuthenticationService,
+		$WebAuthnService,
 		$UserBlockingService,
 		$CacheService,
 		$UserFollowingService,
@@ -667,11 +677,13 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$UserListService,
 		$UserMutingService,
 		$UserSuspendService,
+		$UserAuthService,
 		$VideoProcessingService,
 		$WebhookService,
 		$UtilityService,
 		$FileInfoService,
 		$SearchService,
+		$ClipService,
 		$FederationChart,
 		$NotesChart,
 		$UsersChart,

packages/backend/src/core/CreateSystemUserService.ts

@@ -8,11 +8,11 @@ import { Inject, Injectable } from '@nestjs/common';
 import bcrypt from 'bcryptjs';
 import { IsNull, DataSource } from 'typeorm';
 import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
-import { User } from '@/models/entities/User.js';
+import { MiUser } from '@/models/User.js';
-import { UserProfile } from '@/models/entities/UserProfile.js';
+import { MiUserProfile } from '@/models/UserProfile.js';
 import { IdService } from '@/core/IdService.js';
-import { UserKeypair } from '@/models/entities/UserKeypair.js';
+import { MiUserKeypair } from '@/models/UserKeypair.js';
-import { UsedUsername } from '@/models/entities/UsedUsername.js';
+import { MiUsedUsername } from '@/models/UsedUsername.js';
 import { DI } from '@/di-symbols.js';
 import generateNativeUserToken from '@/misc/generate-native-user-token.js';
 import { bindThis } from '@/decorators.js';
@@ -28,7 +28,7 @@ export class CreateSystemUserService {
 	}
 
 	@bindThis
-	public async createSystemUser(username: string): Promise<User> {
+	public async createSystemUser(username: string): Promise<MiUser> {
 		const password = randomUUID();
 
 		// Generate hash of password
@@ -40,18 +40,18 @@ export class CreateSystemUserService {
 
 		const keyPair = await genRsaKeyPair();
 
-		let account!: User;
+		let account!: MiUser;
 
 		// Start transaction
 		await this.db.transaction(async transactionalEntityManager => {
-			const exist = await transactionalEntityManager.findOneBy(User, {
+			const exist = await transactionalEntityManager.findOneBy(MiUser, {
 				usernameLower: username.toLowerCase(),
 				host: IsNull(),
 			});
 
 			if (exist) throw new Error('the user is already exists');
 
-			account = await transactionalEntityManager.insert(User, {
+			account = await transactionalEntityManager.insert(MiUser, {
 				id: this.idService.genId(),
 				createdAt: new Date(),
 				username: username,
@@ -62,21 +62,21 @@ export class CreateSystemUserService {
 				isLocked: true,
 				isExplorable: false,
 				isBot: true,
-			}).then(x => transactionalEntityManager.findOneByOrFail(User, x.identifiers[0]));
+			}).then(x => transactionalEntityManager.findOneByOrFail(MiUser, x.identifiers[0]));
 
-			await transactionalEntityManager.insert(UserKeypair, {
+			await transactionalEntityManager.insert(MiUserKeypair, {
 				publicKey: keyPair.publicKey,
 				privateKey: keyPair.privateKey,
 				userId: account.id,
 			});
 
-			await transactionalEntityManager.insert(UserProfile, {
+			await transactionalEntityManager.insert(MiUserProfile, {
 				userId: account.id,
 				autoAcceptFollowed: false,
 				password: hash,
 			});
 
-			await transactionalEntityManager.insert(UsedUsername, {
+			await transactionalEntityManager.insert(MiUsedUsername, {
 				createdAt: new Date(),
 				username: username.toLowerCase(),
 			});

packages/backend/src/core/CustomEmojiService.ts

@@ -10,9 +10,9 @@ import { DI } from '@/di-symbols.js';
 import { IdService } from '@/core/IdService.js';
 import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
-import type { DriveFile } from '@/models/entities/DriveFile.js';
+import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { Emoji } from '@/models/entities/Emoji.js';
+import type { MiEmoji } from '@/models/Emoji.js';
-import type { EmojisRepository, Role } from '@/models/index.js';
+import type { EmojisRepository, MiRole } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js';
 import { UtilityService } from '@/core/UtilityService.js';
@@ -23,8 +23,8 @@ const parseEmojiStrRegexp = /^(\w+)(?:@([\w.-]+))?$/;
 
 @Injectable()
 export class CustomEmojiService implements OnApplicationShutdown {
-	private cache: MemoryKVCache<Emoji | null>;
+	private cache: MemoryKVCache<MiEmoji | null>;
-	public localEmojisCache: RedisSingleCache<Map<string, Emoji>>;
+	public localEmojisCache: RedisSingleCache<Map<string, MiEmoji>>;
 
 	constructor(
 		@Inject(DI.redis)
@@ -38,16 +38,16 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		private emojiEntityService: EmojiEntityService,
 		private globalEventService: GlobalEventService,
 	) {
-		this.cache = new MemoryKVCache<Emoji | null>(1000 * 60 * 60 * 12);
+		this.cache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12);
 
-		this.localEmojisCache = new RedisSingleCache<Map<string, Emoji>>(this.redisClient, 'localEmojis', {
+		this.localEmojisCache = new RedisSingleCache<Map<string, MiEmoji>>(this.redisClient, 'localEmojis', {
 			lifetime: 1000 * 60 * 30, // 30m
 			memoryCacheLifetime: 1000 * 60 * 3, // 3m
 			fetcher: () => this.emojisRepository.find({ where: { host: IsNull() } }).then(emojis => new Map(emojis.map(emoji => [emoji.name, emoji]))),
 			toRedisConverter: (value) => JSON.stringify(Array.from(value.values())),
 			fromRedisConverter: (value) => {
 				if (!Array.isArray(JSON.parse(value))) return undefined; // 古いバージョンの壊れたキャッシュが残っていることがある(そのうち消す)
-				return new Map(JSON.parse(value).map((x: Serialized<Emoji>) => [x.name, {
+				return new Map(JSON.parse(value).map((x: Serialized<MiEmoji>) => [x.name, {
 					...x,
 					updatedAt: x.updatedAt ? new Date(x.updatedAt) : null,
 				}]));
@@ -57,7 +57,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 	@bindThis
 	public async add(data: {
-		driveFile: DriveFile;
+		driveFile: MiDriveFile;
 		name: string;
 		category: string | null;
 		aliases: string[];
@@ -65,8 +65,8 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		license: string | null;
 		isSensitive: boolean;
 		localOnly: boolean;
-		roleIdsThatCanBeUsedThisEmojiAsReaction: Role['id'][];
+		roleIdsThatCanBeUsedThisEmojiAsReaction: MiRole['id'][];
-	}): Promise<Emoji> {
+	}): Promise<MiEmoji> {
 		const emoji = await this.emojisRepository.insert({
 			id: this.idService.genId(),
 			updatedAt: new Date(),
@@ -95,15 +95,15 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async update(id: Emoji['id'], data: {
+	public async update(id: MiEmoji['id'], data: {
-		driveFile?: DriveFile;
+		driveFile?: MiDriveFile;
 		name?: string;
 		category?: string | null;
 		aliases?: string[];
 		license?: string | null;
 		isSensitive?: boolean;
 		localOnly?: boolean;
-		roleIdsThatCanBeUsedThisEmojiAsReaction?: Role['id'][];
+		roleIdsThatCanBeUsedThisEmojiAsReaction?: MiRole['id'][];
 	}): Promise<void> {
 		const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
 		const sameNameEmoji = await this.emojisRepository.findOneBy({ name: data.name, host: IsNull() });
@@ -143,7 +143,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async addAliasesBulk(ids: Emoji['id'][], aliases: string[]) {
+	public async addAliasesBulk(ids: MiEmoji['id'][], aliases: string[]) {
 		const emojis = await this.emojisRepository.findBy({
 			id: In(ids),
 		});
@@ -163,7 +163,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async setAliasesBulk(ids: Emoji['id'][], aliases: string[]) {
+	public async setAliasesBulk(ids: MiEmoji['id'][], aliases: string[]) {
 		await this.emojisRepository.update({
 			id: In(ids),
 		}, {
@@ -179,7 +179,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async removeAliasesBulk(ids: Emoji['id'][], aliases: string[]) {
+	public async removeAliasesBulk(ids: MiEmoji['id'][], aliases: string[]) {
 		const emojis = await this.emojisRepository.findBy({
 			id: In(ids),
 		});
@@ -199,7 +199,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async setCategoryBulk(ids: Emoji['id'][], category: string | null) {
+	public async setCategoryBulk(ids: MiEmoji['id'][], category: string | null) {
 		await this.emojisRepository.update({
 			id: In(ids),
 		}, {
@@ -215,7 +215,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async setLicenseBulk(ids: Emoji['id'][], license: string | null) {
+	public async setLicenseBulk(ids: MiEmoji['id'][], license: string | null) {
 		await this.emojisRepository.update({
 			id: In(ids),
 		}, {
@@ -231,7 +231,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async delete(id: Emoji['id']) {
+	public async delete(id: MiEmoji['id']) {
 		const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
 
 		await this.emojisRepository.delete(emoji.id);
@@ -244,7 +244,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async deleteBulk(ids: Emoji['id'][]) {
+	public async deleteBulk(ids: MiEmoji['id'][]) {
 		const emojis = await this.emojisRepository.findBy({
 			id: In(ids),
 		});

packages/backend/src/core/DeleteAccountService.ts

@@ -4,7 +4,7 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import type { UsersRepository } from '@/models/index.js';
+import type { UsersRepository } from '@/models/_.js';
 import { QueueService } from '@/core/QueueService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';

packages/backend/src/core/DriveService.ts

@@ -11,12 +11,12 @@ import { sharpBmp } from 'sharp-read-bmp';
 import { IsNull } from 'typeorm';
 import { DeleteObjectCommandInput, PutObjectCommandInput, NoSuchKey } from '@aws-sdk/client-s3';
 import { DI } from '@/di-symbols.js';
-import type { DriveFilesRepository, UsersRepository, DriveFoldersRepository, UserProfilesRepository } from '@/models/index.js';
+import type { DriveFilesRepository, UsersRepository, DriveFoldersRepository, UserProfilesRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import Logger from '@/logger.js';
-import type { RemoteUser, User } from '@/models/entities/User.js';
+import type { MiRemoteUser, MiUser } from '@/models/User.js';
 import { MetaService } from '@/core/MetaService.js';
-import { DriveFile } from '@/models/entities/DriveFile.js';
+import { MiDriveFile } from '@/models/DriveFile.js';
 import { IdService } from '@/core/IdService.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
@@ -27,7 +27,7 @@ import { VideoProcessingService } from '@/core/VideoProcessingService.js';
 import { ImageProcessingService } from '@/core/ImageProcessingService.js';
 import type { IImage } from '@/core/ImageProcessingService.js';
 import { QueueService } from '@/core/QueueService.js';
-import type { DriveFolder } from '@/models/entities/DriveFolder.js';
+import type { MiDriveFolder } from '@/models/DriveFolder.js';
 import { createTemp } from '@/misc/create-temp.js';
 import DriveChart from '@/core/chart/charts/drive.js';
 import PerUserDriveChart from '@/core/chart/charts/per-user-drive.js';
@@ -45,7 +45,7 @@ import { isMimeImage } from '@/misc/is-mime-image.js';
 
 type AddFileArgs = {
 	/** User who wish to add file */
-	user: { id: User['id']; host: User['host'] } | null;
+	user: { id: MiUser['id']; host: MiUser['host'] } | null;
 	/** File path */
 	path: string;
 	/** Name */
@@ -73,8 +73,8 @@ type AddFileArgs = {
 
 type UploadFromUrlArgs = {
 	url: string;
-	user: { id: User['id']; host: User['host'] } | null;
+	user: { id: MiUser['id']; host: MiUser['host'] } | null;
-	folderId?: DriveFolder['id'] | null;
+	folderId?: MiDriveFolder['id'] | null;
 	uri?: string | null;
 	sensitive?: boolean;
 	force?: boolean;
@@ -138,7 +138,7 @@ export class DriveService {
 	 * @param size Size for original
 	 */
 	@bindThis
-	private async save(file: DriveFile, path: string, name: string, type: string, hash: string, size: number): Promise<DriveFile> {
+	private async save(file: MiDriveFile, path: string, name: string, type: string, hash: string, size: number): Promise<MiDriveFile> {
 	// thunbnail, webpublic を必要なら生成
 		const alts = await this.generateAlts(path, type, !file.uri);
 
@@ -405,7 +405,7 @@ export class DriveService {
 
 	// Expire oldest file (without avatar or banner) of remote user
 	@bindThis
-	private async expireOldFile(user: RemoteUser, driveCapacity: number) {
+	private async expireOldFile(user: MiRemoteUser, driveCapacity: number) {
 		const q = this.driveFilesRepository.createQueryBuilder('file')
 			.where('file.userId = :userId', { userId: user.id })
 			.andWhere('file.isLink = FALSE');
@@ -451,7 +451,7 @@ export class DriveService {
 		requestIp = null,
 		requestHeaders = null,
 		ext = null,
-	}: AddFileArgs): Promise<DriveFile> {
+	}: AddFileArgs): Promise<MiDriveFile> {
 		let skipNsfwCheck = false;
 		const instance = await this.metaService.fetch();
 		const userRoleNSFW = user && (await this.roleService.getUserPolicies(user.id)).alwaysMarkNsfw;
@@ -520,7 +520,7 @@ export class DriveService {
 				if (isLocalUser) {
 					throw new IdentifiableError('c6244ed2-a39a-4e1c-bf93-f0fbd7764fa6', 'No free space.');
 				}
-				await this.expireOldFile(await this.usersRepository.findOneByOrFail({ id: user.id }) as RemoteUser, driveCapacity - info.size);
+				await this.expireOldFile(await this.usersRepository.findOneByOrFail({ id: user.id }) as MiRemoteUser, driveCapacity - info.size);
 			}
 		}
 		//#endregion
@@ -558,7 +558,7 @@ export class DriveService {
 
 		const folder = await fetchFolder();
 
-		let file = new DriveFile();
+		let file = new MiDriveFile();
 		file.id = this.idService.genId();
 		file.createdAt = new Date();
 		file.userId = user ? user.id : null;
@@ -614,7 +614,7 @@ export class DriveService {
 					file = await this.driveFilesRepository.findOneBy({
 						uri: file.uri!,
 						userId: user ? user.id : IsNull(),
-					}) as DriveFile;
+					}) as MiDriveFile;
 				} else {
 					this.registerLogger.error(err as Error);
 					throw err;
@@ -648,7 +648,7 @@ export class DriveService {
 	}
 
 	@bindThis
-	public async deleteFile(file: DriveFile, isExpired = false) {
+	public async deleteFile(file: MiDriveFile, isExpired = false) {
 		if (file.storedInternal) {
 			this.internalStorageService.del(file.accessKey!);
 
@@ -675,7 +675,7 @@ export class DriveService {
 	}
 
 	@bindThis
-	public async deleteFileSync(file: DriveFile, isExpired = false) {
+	public async deleteFileSync(file: MiDriveFile, isExpired = false) {
 		if (file.storedInternal) {
 			this.internalStorageService.del(file.accessKey!);
 
@@ -706,7 +706,7 @@ export class DriveService {
 	}
 
 	@bindThis
-	private async deletePostProcess(file: DriveFile, isExpired = false) {
+	private async deletePostProcess(file: MiDriveFile, isExpired = false) {
 		// リモートファイル期限切れ削除後は直リンクにする
 		if (isExpired && file.userHost !== null && file.uri != null) {
 			this.driveFilesRepository.update(file.id, {
@@ -769,7 +769,7 @@ export class DriveService {
 		comment = null,
 		requestIp = null,
 		requestHeaders = null,
-	}: UploadFromUrlArgs): Promise<DriveFile> {
+	}: UploadFromUrlArgs): Promise<MiDriveFile> {
 		// Create temp file
 		const [path, cleanup] = await createTemp();
 

packages/backend/src/core/EmailService.ts

@@ -10,7 +10,7 @@ import { MetaService } from '@/core/MetaService.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import type Logger from '@/logger.js';
-import type { UserProfilesRepository } from '@/models/index.js';
+import type { UserProfilesRepository } from '@/models/_.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
 

packages/backend/src/core/FederatedInstanceService.ts

@@ -5,8 +5,8 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { InstancesRepository } from '@/models/index.js';
+import type { InstancesRepository } from '@/models/_.js';
-import type { Instance } from '@/models/entities/Instance.js';
+import type { MiInstance } from '@/models/Instance.js';
 import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
 import { IdService } from '@/core/IdService.js';
 import { DI } from '@/di-symbols.js';
@@ -15,7 +15,7 @@ import { bindThis } from '@/decorators.js';
 
 @Injectable()
 export class FederatedInstanceService implements OnApplicationShutdown {
-	public federatedInstanceCache: RedisKVCache<Instance | null>;
+	public federatedInstanceCache: RedisKVCache<MiInstance | null>;
 
 	constructor(
 		@Inject(DI.redis)
@@ -27,7 +27,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 		private utilityService: UtilityService,
 		private idService: IdService,
 	) {
-		this.federatedInstanceCache = new RedisKVCache<Instance | null>(this.redisClient, 'federatedInstance', {
+		this.federatedInstanceCache = new RedisKVCache<MiInstance | null>(this.redisClient, 'federatedInstance', {
 			lifetime: 1000 * 60 * 30, // 30m
 			memoryCacheLifetime: 1000 * 60 * 3, // 3m
 			fetcher: (key) => this.instancesRepository.findOneBy({ host: key }),
@@ -46,7 +46,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async fetch(host: string): Promise<Instance> {
+	public async fetch(host: string): Promise<MiInstance> {
 		host = this.utilityService.toPuny(host);
 
 		const cached = await this.federatedInstanceCache.get(host);
@@ -70,7 +70,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async update(id: Instance['id'], data: Partial<Instance>): Promise<void> {
+	public async update(id: MiInstance['id'], data: Partial<MiInstance>): Promise<void> {
 		const result = await this.instancesRepository.createQueryBuilder().update()
 			.set(data)
 			.where('id = :id', { id })

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { JSDOM } from 'jsdom';
 import tinycolor from 'tinycolor2';
 import * as Redis from 'ioredis';
-import type { Instance } from '@/models/entities/Instance.js';
+import type { MiInstance } from '@/models/Instance.js';
 import type Logger from '@/logger.js';
 import { DI } from '@/di-symbols.js';
 import { LoggerService } from '@/core/LoggerService.js';
@@ -62,7 +62,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	public async fetchInstanceMetadata(instance: Instance, force = false): Promise<void> {
+	public async fetchInstanceMetadata(instance: MiInstance, force = false): Promise<void> {
 		const host = instance.host;
 		// Acquire mutex to ensure no parallel runs
 		if (!await this.tryLock(host)) return;
@@ -123,7 +123,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchNodeinfo(instance: Instance): Promise<NodeInfo> {
+	private async fetchNodeinfo(instance: MiInstance): Promise<NodeInfo> {
 		this.logger.info(`Fetching nodeinfo of ${instance.host} ...`);
 
 		try {
@@ -142,10 +142,10 @@ export class FetchInstanceMetadataService {
 
 			const links = wellknown.links as any[];
 
-			const lnik1_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/1.0');
+			const link1_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/1.0');
-			const lnik2_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.0');
+			const link2_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.0');
-			const lnik2_1 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.1');
+			const link2_1 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.1');
-			const link = lnik2_1 ?? lnik2_0 ?? lnik1_0;
+			const link = link2_1 ?? link2_0 ?? link1_0;
 
 			if (link == null) {
 				throw new Error('No nodeinfo link provided');
@@ -167,7 +167,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchDom(instance: Instance): Promise<DOMWindow['document']> {
+	private async fetchDom(instance: MiInstance): Promise<DOMWindow['document']> {
 		this.logger.info(`Fetching HTML of ${instance.host} ...`);
 
 		const url = 'https://' + instance.host;
@@ -181,7 +181,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchManifest(instance: Instance): Promise<Record<string, unknown> | null> {
+	private async fetchManifest(instance: MiInstance): Promise<Record<string, unknown> | null> {
 		const url = 'https://' + instance.host;
 
 		const manifestUrl = url + '/manifest.json';
@@ -192,7 +192,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchFaviconUrl(instance: Instance, doc: DOMWindow['document'] | null): Promise<string | null> {
+	private async fetchFaviconUrl(instance: MiInstance, doc: DOMWindow['document'] | null): Promise<string | null> {
 		const url = 'https://' + instance.host;
 
 		if (doc) {
@@ -218,7 +218,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchIconUrl(instance: Instance, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
+	private async fetchIconUrl(instance: MiInstance, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		if (manifest && manifest.icons && manifest.icons.length > 0 && manifest.icons[0].src) {
 			const url = 'https://' + instance.host;
 			return (new URL(manifest.icons[0].src, url)).href;

packages/backend/src/core/GlobalEventService.ts

@@ -5,10 +5,10 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/User.js';
-import type { Note } from '@/models/entities/Note.js';
+import type { MiNote } from '@/models/Note.js';
-import type { UserList } from '@/models/entities/UserList.js';
+import type { MiUserList } from '@/models/UserList.js';
-import type { Antenna } from '@/models/entities/Antenna.js';
+import type { MiAntenna } from '@/models/Antenna.js';
 import type {
 	StreamChannels,
 	AdminStreamTypes,
@@ -25,7 +25,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { bindThis } from '@/decorators.js';
-import { Role } from '@/models/index.js';
+import { MiRole } from '@/models/_.js';
 
 @Injectable()
 export class GlobalEventService {
@@ -61,17 +61,17 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishMainStream<K extends keyof MainStreamTypes>(userId: User['id'], type: K, value?: MainStreamTypes[K]): void {
+	public publishMainStream<K extends keyof MainStreamTypes>(userId: MiUser['id'], type: K, value?: MainStreamTypes[K]): void {
 		this.publish(`mainStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishDriveStream<K extends keyof DriveStreamTypes>(userId: User['id'], type: K, value?: DriveStreamTypes[K]): void {
+	public publishDriveStream<K extends keyof DriveStreamTypes>(userId: MiUser['id'], type: K, value?: DriveStreamTypes[K]): void {
 		this.publish(`driveStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishNoteStream<K extends keyof NoteStreamTypes>(noteId: Note['id'], type: K, value?: NoteStreamTypes[K]): void {
+	public publishNoteStream<K extends keyof NoteStreamTypes>(noteId: MiNote['id'], type: K, value?: NoteStreamTypes[K]): void {
 		this.publish(`noteStream:${noteId}`, type, {
 			id: noteId,
 			body: value,
@@ -79,17 +79,17 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishUserListStream<K extends keyof UserListStreamTypes>(listId: UserList['id'], type: K, value?: UserListStreamTypes[K]): void {
+	public publishUserListStream<K extends keyof UserListStreamTypes>(listId: MiUserList['id'], type: K, value?: UserListStreamTypes[K]): void {
 		this.publish(`userListStream:${listId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishAntennaStream<K extends keyof AntennaStreamTypes>(antennaId: Antenna['id'], type: K, value?: AntennaStreamTypes[K]): void {
+	public publishAntennaStream<K extends keyof AntennaStreamTypes>(antennaId: MiAntenna['id'], type: K, value?: AntennaStreamTypes[K]): void {
 		this.publish(`antennaStream:${antennaId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishRoleTimelineStream<K extends keyof RoleTimelineStreamTypes>(roleId: Role['id'], type: K, value?: RoleTimelineStreamTypes[K]): void {
+	public publishRoleTimelineStream<K extends keyof RoleTimelineStreamTypes>(roleId: MiRole['id'], type: K, value?: RoleTimelineStreamTypes[K]): void {
 		this.publish(`roleTimelineStream:${roleId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
@@ -99,7 +99,7 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishAdminStream<K extends keyof AdminStreamTypes>(userId: User['id'], type: K, value?: AdminStreamTypes[K]): void {
+	public publishAdminStream<K extends keyof AdminStreamTypes>(userId: MiUser['id'], type: K, value?: AdminStreamTypes[K]): void {
 		this.publish(`adminStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 }

packages/backend/src/core/HashtagService.ts

@@ -5,11 +5,11 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/User.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { IdService } from '@/core/IdService.js';
-import type { Hashtag } from '@/models/entities/Hashtag.js';
+import type { MiHashtag } from '@/models/Hashtag.js';
-import type { HashtagsRepository } from '@/models/index.js';
+import type { HashtagsRepository } from '@/models/_.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 
@@ -25,14 +25,14 @@ export class HashtagService {
 	}
 
 	@bindThis
-	public async updateHashtags(user: { id: User['id']; host: User['host']; }, tags: string[]) {
+	public async updateHashtags(user: { id: MiUser['id']; host: MiUser['host']; }, tags: string[]) {
 		for (const tag of tags) {
 			await this.updateHashtag(user, tag);
 		}
 	}
 
 	@bindThis
-	public async updateUsertags(user: User, tags: string[]) {
+	public async updateUsertags(user: MiUser, tags: string[]) {
 		for (const tag of tags) {
 			await this.updateHashtag(user, tag, true, true);
 		}
@@ -43,7 +43,7 @@ export class HashtagService {
 	}
 
 	@bindThis
-	public async updateHashtag(user: { id: User['id']; host: User['host']; }, tag: string, isUserAttached = false, inc = true) {
+	public async updateHashtag(user: { id: MiUser['id']; host: MiUser['host']; }, tag: string, isUserAttached = false, inc = true) {
 		tag = normalizeForSearch(tag);
 
 		const index = await this.hashtagsRepository.findOneBy({ name: tag });
@@ -123,7 +123,7 @@ export class HashtagService {
 					attachedLocalUsersCount: this.userEntityService.isLocalUser(user) ? 1 : 0,
 					attachedRemoteUserIds: this.userEntityService.isRemoteUser(user) ? [user.id] : [],
 					attachedRemoteUsersCount: this.userEntityService.isRemoteUser(user) ? 1 : 0,
-				} as Hashtag);
+				} as MiHashtag);
 			} else {
 				this.hashtagsRepository.insert({
 					id: this.idService.genId(),
@@ -140,7 +140,7 @@ export class HashtagService {
 					attachedLocalUsersCount: 0,
 					attachedRemoteUserIds: [],
 					attachedRemoteUsersCount: 0,
-				} as Hashtag);
+				} as MiHashtag);
 			}
 		}
 	}

packages/backend/src/core/HttpRequestService.ts

@@ -53,12 +53,14 @@ export class HttpRequestService {
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup as unknown as net.LookupFunction,
+			localAddress: config.outgoingAddress,
 		});
 
 		this.https = new https.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup as unknown as net.LookupFunction,
+			localAddress: config.outgoingAddress,
 		});
 
 		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
@@ -71,6 +73,7 @@ export class HttpRequestService {
 				maxFreeSockets: 256,
 				scheduling: 'lifo',
 				proxy: config.proxy,
+				localAddress: config.outgoingAddress,
 			})
 			: this.http;
 
@@ -82,6 +85,7 @@ export class HttpRequestService {
 				maxFreeSockets: 256,
 				scheduling: 'lifo',
 				proxy: config.proxy,
+				localAddress: config.outgoingAddress,
 			})
 			: this.https;
 	}

packages/backend/src/core/IdService.ts

@@ -8,6 +8,7 @@ import { ulid } from 'ulid';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { genAid, parseAid } from '@/misc/id/aid.js';
+import { genAidx, parseAidx } from '@/misc/id/aidx.js';
 import { genMeid, parseMeid } from '@/misc/id/meid.js';
 import { genMeidg, parseMeidg } from '@/misc/id/meidg.js';
 import { genObjectId, parseObjectId } from '@/misc/id/object-id.js';
@@ -31,6 +32,7 @@ export class IdService {
 
 		switch (this.method) {
 			case 'aid': return genAid(date);
+			case 'aidx': return genAidx(date);
 			case 'meid': return genMeid(date);
 			case 'meidg': return genMeidg(date);
 			case 'ulid': return ulid(date.getTime());
@@ -43,6 +45,7 @@ export class IdService {
 	public parse(id: string): { date: Date; } {
 		switch (this.method) {
 			case 'aid': return parseAid(id);
+			case 'aidx': return parseAidx(id);
 			case 'objectid': return parseObjectId(id);
 			case 'meid': return parseMeid(id);
 			case 'meidg': return parseMeidg(id);

packages/backend/src/core/InstanceActorService.ts

@@ -5,8 +5,8 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { IsNull } from 'typeorm';
-import type { LocalUser } from '@/models/entities/User.js';
+import type { MiLocalUser } from '@/models/User.js';
-import type { UsersRepository } from '@/models/index.js';
+import type { UsersRepository } from '@/models/_.js';
 import { MemorySingleCache } from '@/misc/cache.js';
 import { DI } from '@/di-symbols.js';
 import { CreateSystemUserService } from '@/core/CreateSystemUserService.js';
@@ -16,7 +16,7 @@ const ACTOR_USERNAME = 'instance.actor' as const;
 
 @Injectable()
 export class InstanceActorService {
-	private cache: MemorySingleCache<LocalUser>;
+	private cache: MemorySingleCache<MiLocalUser>;
 
 	constructor(
 		@Inject(DI.usersRepository)
@@ -24,24 +24,24 @@ export class InstanceActorService {
 
 		private createSystemUserService: CreateSystemUserService,
 	) {
-		this.cache = new MemorySingleCache<LocalUser>(Infinity);
+		this.cache = new MemorySingleCache<MiLocalUser>(Infinity);
 	}
 
 	@bindThis
-	public async getInstanceActor(): Promise<LocalUser> {
+	public async getInstanceActor(): Promise<MiLocalUser> {
 		const cached = this.cache.get();
 		if (cached) return cached;
 
 		const user = await this.usersRepository.findOneBy({
 			host: IsNull(),
 			username: ACTOR_USERNAME,
-		}) as LocalUser | undefined;
+		}) as MiLocalUser | undefined;
 
 		if (user) {
 			this.cache.set(user);
 			return user;
 		} else {
-			const created = await this.createSystemUserService.createSystemUser(ACTOR_USERNAME) as LocalUser;
+			const created = await this.createSystemUserService.createSystemUser(ACTOR_USERNAME) as MiLocalUser;
 			this.cache.set(created);
 			return created;
 		}

packages/backend/src/core/MetaService.ts

@@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
-import { Meta } from '@/models/entities/Meta.js';
+import { MiMeta } from '@/models/Meta.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { bindThis } from '@/decorators.js';
 import { StreamMessages } from '@/server/api/stream/types.js';
@@ -15,8 +15,8 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
 export class MetaService implements OnApplicationShutdown {
-	private cache: Meta | undefined;
+	private cache: MiMeta | undefined;
-	private intervalId: NodeJS.Timer;
+	private intervalId: NodeJS.Timeout;
 
 	constructor(
 		@Inject(DI.redisForSub)
@@ -59,12 +59,12 @@ export class MetaService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async fetch(noCache = false): Promise<Meta> {
+	public async fetch(noCache = false): Promise<MiMeta> {
 		if (!noCache && this.cache) return this.cache;
 
 		return await this.db.transaction(async transactionalEntityManager => {
 			// 過去のバグでレコードが複数出来てしまっている可能性があるので新しいIDを優先する
-			const metas = await transactionalEntityManager.find(Meta, {
+			const metas = await transactionalEntityManager.find(MiMeta, {
 				order: {
 					id: 'DESC',
 				},
@@ -79,13 +79,13 @@ export class MetaService implements OnApplicationShutdown {
 				// metaが空のときfetchMetaが同時に呼ばれるとここが同時に呼ばれてしまうことがあるのでフェイルセーフなupsertを使う
 				const saved = await transactionalEntityManager
 					.upsert(
-						Meta,
+						MiMeta,
 						{
 							id: 'x',
 						},
 						['id'],
 					)
-					.then((x) => transactionalEntityManager.findOneByOrFail(Meta, x.identifiers[0]));
+					.then((x) => transactionalEntityManager.findOneByOrFail(MiMeta, x.identifiers[0]));
 
 				this.cache = saved;
 				return saved;
@@ -94,9 +94,9 @@ export class MetaService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async update(data: Partial<Meta>): Promise<Meta> {
+	public async update(data: Partial<MiMeta>): Promise<MiMeta> {
 		const updated = await this.db.transaction(async transactionalEntityManager => {
-			const metas = await transactionalEntityManager.find(Meta, {
+			const metas = await transactionalEntityManager.find(MiMeta, {
 				order: {
 					id: 'DESC',
 				},
@@ -105,9 +105,9 @@ export class MetaService implements OnApplicationShutdown {
 			const meta = metas[0];
 
 			if (meta) {
-				await transactionalEntityManager.update(Meta, meta.id, data);
+				await transactionalEntityManager.update(MiMeta, meta.id, data);
 
-				const metas = await transactionalEntityManager.find(Meta, {
+				const metas = await transactionalEntityManager.find(MiMeta, {
 					order: {
 						id: 'DESC',
 					},
@@ -115,7 +115,7 @@ export class MetaService implements OnApplicationShutdown {
 
 				return metas[0];
 			} else {
-				return await transactionalEntityManager.save(Meta, data);
+				return await transactionalEntityManager.save(MiMeta, data);
 			}
 		});