Merge branch 'develop' into fetch-outbox

.config/docker_example.yml

@@ -95,14 +95,6 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#redisForTimelines:
-#  host: redis
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

.config/example.yml

@@ -30,7 +30,7 @@ url: https://example.tld/
 # The port that your Misskey server should listen on.
 port: 3000
 
-# You can also use UNIX domain socket.
+# You can also use UNIX domain socket. 
 # socket: /path/to/misskey.sock
 # chmodSocket: '777'
 
@@ -60,17 +60,17 @@ dbReplications: false
 # You can configure any number of replicas here
 #dbSlaves:
 #  -
-#    host:
-#    port:
-#    db:
-#    user:
-#    pass:
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
 #  -
-#    host:
-#    port:
-#    db:
-#    user:
-#    pass:
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
 
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
@@ -105,16 +105,6 @@ redis:
 #  # You can specify more ioredis options...
 #  #username: example-username
 
-#redisForTimelines:
-#  host: localhost
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-#  # You can specify more ioredis options...
-#  #username: example-username
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 
@@ -216,6 +206,3 @@ signToActivityPubGet: true
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
-
-# PID File of master process
-#pidFile: /tmp/misskey.pid

.devcontainer/devcontainer.json

@@ -4,9 +4,7 @@
 	"service": "app",
 	"workspaceFolder": "/workspace",
 	"features": {
-		"ghcr.io/devcontainers-contrib/features/pnpm:2": {
-			"version": "8.8.0"
-		},
+		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "20.5.1"
 		}

.devcontainer/devcontainer.yml

@@ -95,14 +95,6 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#redisForTimelines:
-#  host: redis
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

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

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.0.0
 
       - run: corepack enable
 

.github/workflows/check_copyright_year.yml

@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.0
+    - 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,7 +13,7 @@ jobs:
     if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/dockle.yml

@@ -14,7 +14,7 @@ jobs:
     env:
       DOCKER_CONTENT_TRUST: 1
     steps:
-      - uses: actions/checkout@v4.1.0
+      - 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@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -38,7 +38,7 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -64,7 +64,7 @@ jobs:
         - backend
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true

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

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

.github/workflows/test-backend.yml

@@ -29,7 +29,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm

.github/workflows/test-frontend.yml

@@ -16,7 +16,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm
@@ -68,7 +68,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150

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

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.0.0
 
       - run: corepack enable
 

.github/workflows/test-production.yml

@@ -19,7 +19,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm

CHANGELOG.md

@@ -8,178 +8,48 @@
 -
 
 ### Server
--
+- 最初照会したユーザーの最新ノートを受け取るように
 
 -->
 
-## 2023.10.1
-### General
-- Enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
-
-### Client
-- Fix: 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正
-
-### Server
-- Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
-- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
-
-## 2023.10.0
-### NOTE
-- 2023.9.2で導入されたノート編集機能はクオリティの高い実装が困難であることが判明したため撤回されました
-- アップデートを行うと、タイムラインが一時的にリセットされます
-- ソフトミュート設定はクライアントではなくサーバー側に保存されるようになったため、アップデートを行うとソフトミュートの設定がリセットされます
-
-### Changes
-- API: users/notes, notes/local-timeline で fileType 指定はできなくなりました
-- API: notes/featured でページネーションは他APIと同様 untilId を使って行うようになりました
+## 2023.9.0 (unreleased)
 
 ### General
-- Feat: ユーザーごとに他ユーザーへの返信をタイムラインに含めるか設定可能になりました
-- Feat: ユーザーリスト内のメンバーごとに他ユーザーへの返信をユーザーリストタイムラインに含めるか設定可能になりました
-- Feat: ユーザーごとのハイライト
-- Feat: プライバシーポリシー・運営者情報（Impressum）の指定が可能になりました
-	- プライバシーポリシーはサーバー登録時に同意確認が入ります
-- Feat: タイムラインがリアルタイム更新中に広告を挿入できるようになりました
-	- デフォルトは無効
-	- 頻度はコントロールパネルから設定できます。運営中のサーバーのTLの流速を見て、最適な値を指定してください。
-- Enhance: ソフトワードミュートとハードワードミュートは統合されました
-- Enhance: モデレーションログ機能の強化
-- Enhance: ローカリゼーションの更新
-- Enhance: 依存関係の更新
-- Fix: ダイレクト投稿をリノートできてしまう問題を修正
-- Fix: ユーザーリストTLにチャンネル投稿が含まれる問題を修正
-
-### Client
-- Feat: 「ファイルの詳細」ページを追加
-	- ドライブのファイルの拡大プレビューができるように
-	- ファイルが添付されたノートの一覧が表示できるように
-- Enhance: 二要素認証のバックアップコード一覧をテキストファイルでダウンロード可能に
-- Enhance: 動画再生時のデフォルトボリュームを30%に
-- Fix: リアクションしたユーザ一覧のUIが稀に左上に残ってしまう不具合を修正
-
-### Server
-- Enhance: drive/files/attached-notes がページネーションに対応しました
-- Enhance: タイムライン取得時のパフォーマンスを大幅に向上
-- Enhance: ハイライト取得時のパフォーマンスを大幅に向上
-- Enhance: トレンドハッシュタグ取得時のパフォーマンスを大幅に向上
-- Enhance: WebSocket接続が多い場合のパフォーマンスを向上
-- Enhance: 不要なPostgreSQLのインデックスを削除しパフォーマンスを向上
-- Fix: 連合なしアンケートに投票をするとUpdateがリモートに配信されてしまうのを修正
-- Fix: nodeinfoにおいてCORS用のヘッダーが設定されていないのを修正
-- Fix: 同じ種類のTLのストリーミングを複数接続できない問題を修正
-- Fix: アンテナTLを途中までしかページネーションできなくなることがある問題を修正
-- Fix: 「ファイル付きのみ」のTLでファイル無しの新着ノートが流れる問題を修正
-- Fix: プロセスが終了しない、あるいは非常に時間がかかる問題を修正
-
-## 2023.9.3
-### General
-- Enhance: ノートの翻訳機能の利用可否をロールで設定可能に
-
-### Client
-- Enhance: AiScriptでホストのアドレスを参照する定数`SERVER_URL`を追加
-- Enhance: モデレーションログ機能の強化
-- Enhance: ローカリゼーションの更新
-
-### Server
-- Fix: Redisに古いバージョンのキャッシュが残っている場合、キャッシュが消えるまでの間通知が届かなくなる問題を修正
-- Fix: 後方互換性の修正
-
-## 2023.9.2
-
-### General
-- Feat: ノートの編集をできるように
-	- ロールで編集可否を設定可能
-- Feat: 通知を種類ごとに 全員から受け取る/フォロー中のユーザーのみ受け取る/フォロワーのみ受け取る/相互のみ受け取る/指定したリストのメンバーのみ受け取る/受け取らない から選べるように
-- Enhance: タイムラインからRenoteを除外するオプションを追加
-- Enhance: ユーザーページのノート一覧でRenoteを除外できるように
-- Enhance: タイムラインでファイルが添付されたノートのみ表示するオプションを追加
-- Enhance: モデレーションログ機能の強化
-- Enhance: 依存関係の更新
-- Enhance: ローカリゼーションの更新
-
-### Client
-- Enhance: Plugin:register_post_form_actionを用いてCWを取得・変更できるように
-- Enhance: admin/ad/listにて掲載中の広告が絞り込めるように
-- Enhance: AiScriptにリモートサーバーのAPIを叩く用の関数を追加（`Mk:apiExternal`）
-
-### Server
-- Enhance: MasterプロセスのPIDを書き出せるように
-- Enhance: admin/ad/createにてレスポンス200、設定した広告情報を返すように
-
-## 2023.9.1
-
-### General
-- Enhance: モデレーションログ機能の強化
-
-### Client
-- Fix: ノートのメニューにある「詳細」ボタンの表示がログイン/ログアウト状態で統一されていない問題を修正
-
-### Server
-- Fix: お知らせのページネーションが機能しない
-- Fix: 「ユーザーの新規投稿」の通知設定を切り替えるとサーバー内部エラーが出る
-
-## 2023.9.0
-
-### Note
-- meilisearchを使用する場合、v1.2以上が必要です
-
-### General
-- Feat: OAuth 2.0のサポート
-- Feat: お知らせ機能の強化
+- OAuth 2.0のサポート
+- お知らせ機能の強化
 	- ユーザー個別のお知らせを作成可能に
 	- お知らせのバナー表示やダイアログ表示が可能に
 	- お知らせのアイコンを設定可能に
-- Feat: チャンネルをセンシティブ指定できるようになりました
+- チャンネルをセンシティブ指定できるようになりました
 	- センシティブチャンネルのNoteのReNoteはデフォルトでHome TLに流れるようになりました
 	- センシティブチャンネルのノートはユーザープロフィールに表示されません
-- Feat: 二要素認証のバックアップコードが生成されるようになりました
-	- ref. https://github.com/MisskeyIO/misskey/pull/121
-- Feat: 二要素認証でパスキーをサポートするようになりました
-- Feat: 指定したユーザーが投稿したときに通知できるようになりました
-- Feat: プロフィールでのリンク検証
-- Feat: モデレーションログ機能
-- Feat: 通知をテストできるようになりました
-- Feat: PWAのアイコンが設定できるようになりました
-- Enhance: サーバー名の略称が設定できるようになりました
-- Enhance: アンテナの受信ソースに指定したユーザを除外するものを追加
-- Enhance: 二要素認証設定時のセキュリティを強化
-	- パスワード入力が必要な操作を行う際、二要素認証が有効であれば確認コードの入力も必要になりました
-- Enhance: manifest.jsonをオーバーライド可能に
-- Enhance: 依存関係の更新
-- Enhance: ローカリゼーションの更新
+- 二要素認証のバックアップコードが生成されるようになりました ref. https://github.com/MisskeyIO/misskey/pull/121
+- 二要素認証でパスキーをサポートするようになりました
+- 通知をテストできるようになりました
+- PWAのアイコンが設定できるようになりました
+- manifest.jsonをオーバーライド可能に
 
 ### Client
-- Feat: 任意のユーザーリストをタイムラインページにピン留めできるように
-	- 設定->クライアント設定->全般 から設定可能です
-- Feat: Playで直接投稿フォームを埋め込めるように(`Ui:C:postForm`)
-- Feat: クライアントを起動している間、デバイスの画面が自動でオフになるのを防ぐオプションを追加
-- Feat: 新しい実績を追加
-- Enhance: ノート詳細ページでリノート一覧、リアクション一覧タブを追加
-	- ノートのメニューからは当該項目は消えました
-- Enhance: センシティブなメディアを目立たせる設定を追加
-- Enhance: プロフィールにその人が作ったPlayの一覧出せるように
-- Enhance: メニューのスイッチの動作を改善
-- Enhance: 絵文字ピッカーの検索の表示件数を100件に増加
-- Enhance: 投稿フォームのプレビューの表示状態を記憶するように
+- プロフィールにその人が作ったPlayの一覧出せるように
+- メニューのスイッチの動作を改善
+- 絵文字ピッカーの検索の表示件数を100件に増加
+- 投稿フォームのプレビューの表示状態を記憶するように
+- AiScriptからMisskeyサーバーAPIを呼び出す際の制限を撤廃
+- Playで直接投稿フォームを埋め込めるように(`Ui:C:postForm`)
 - Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように
 - Enhance: 自分が押したリアクションのデザインを改善
 - Enhance: ノート検索にローカルのみ検索可能なオプションの追加
+- Enhance: AiScriptで`LOCALE`として現在の設定言語を取得できるように
 - 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: プラグインのソースコードを確認・コピーできるように
-- Enhance: 細かなデザインの調整
+- `$[rainbow ]`記法が、動きのあるMFMが無効になっていても使用できるようになりました
+- Playの操作を行うAPI TokenをAPIコンソールから発行できるように
+- リアクションの表示サイズをより大きくできるように
+- ノート詳細ページ読み込み時のパフォーマンスを改善
+- タイムラインでリスト/アンテナ選択時のパフォーマンスを改善
+- 「Moderation note」、「Add moderation note」をローカライズできるように
+- 新しい実績を追加
 - Fix: サーバー情報画面(`/instance-info/{domain}`)でブロックができないのを修正
 - Fix: 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正
 - Fix: iOSで画面を回転させるとテキストサイズが変わる問題を修正
@@ -187,32 +57,21 @@
 - Fix: タイムラインを下にスクロールしてノート画面に移動して再び戻ったら以前のスクロール位置を失う問題を修正
 - Fix: Misskeyプラグインをインストールする際のAiScriptバージョンのチェックが0.14.0以降に対応していない問題を修正
 - Fix: 他のサーバーのユーザーへ「メッセージを送信」した時の初期テキストのメンションが間違っている問題を修正
-- Fix: 環境によってはMisskey Webが開けない問題を修正
-- Fix: プラグインの権限リストが見れない問題を修正
-- Fix: 複数の階層があるメニューで、短くタップすると正常に動かない場合がある問題を修正
-- Fix: アニメーションがオフのとき、スマホで子メニューの選択ができない問題を修正
-- Fix: ドロワーメニューで、親メニュー項目をマウスでホバーすると子メニューが表示されてしまう問題を修正
-- Fix: AiScriptでMk:apiが外部と通信できる問題を修正
 
 ### Server
-- Change: cacheRemoteFilesの初期値はfalseになりました
-- Enhance: ファイルアップロード時等にファイル名の拡張子を修正する関数(correctFilename)の挙動を改善
-- Enhance: Webhookのペイロードにサーバーのurlが含まれるようになりました
-- Enhance: Webhook設定でsecretを空に出来るように
-- Enhance: 使われていないアンテナの自動停止を設定可能に
-- Enhance: nodeinfo 2.1対応
-- Enhance: 自分へのメンション一覧を取得する際のパフォーマンスを向上
-- Enhance: Docker環境でjemallocを使用することでメモリ使用量を削減
-- Enhance: ID生成方式としてaidxを追加、かつデフォルトに
-- Enhance: Add address bind config option (outgoingAddress)
-- Fix: MK_ONLY_SERVERオプションを指定した際にクラッシュする問題を修正
-- Fix: notes/reactionsのページネーションが機能しない問題を修正
+- cacheRemoteFilesの初期値はfalseになりました
+- ファイルアップロード時等にファイル名の拡張子を修正する関数(correctFilename)の挙動を改善
+- Webhookのペイロードにサーバーのurlが含まれるようになりました
+- Webhook設定でsecretを空に出来るように
+- 使われていないアンテナの自動停止を設定可能に
+- nodeinfo 2.1対応
+- 自分へのメンション一覧を取得する際のパフォーマンスを向上
+- Docker環境でjemallocを使用することでメモリ使用量を削減
 - Fix: ノート検索 `notes/search` にてhostを指定した際に検索結果に反映されるように
 - Fix: 一部のfeatured noteを照会できない問題を修正
 - Fix: muteがapiからのuser list timeline取得で機能しない問題を修正
 - Fix: ジョブキュー管理画面の認証を回避できる問題を修正
 - Fix: 一部のサーバー内部エラーがスタックトレースを返さないように修正
-- Fix: 一部のリモートユーザーをフォローすることができない問題を修正
 
 ## 13.14.2
 
@@ -227,6 +86,7 @@
 ### Server
 - Fix: APIのオフセットが壊れていたせいで「もっと見る」でもっと見れない問題を修正
 - Fix: 外部サーバーの投稿がタイムラインに表示されないことがある問題を修正
+- Enhance: Add address bind config option (outgoingAddress)
 
 ## 13.14.1
 

Dockerfile

@@ -63,7 +63,6 @@ ARG GID="991"
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	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 \
@@ -82,7 +81,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 LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
 ENV NODE_ENV=production
 HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]

chart/files/default.yml

@@ -116,14 +116,6 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#redisForTimelines:
-#  host: redis
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 
@@ -195,6 +187,10 @@ id: "aidx"
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true
 
+# Limit of notes to fetch from outbox with remote user first fetched (default: 5)
+# https://github.com/misskey-dev/misskey/pull/11130
+outboxNotesFetchLimit: 5
+
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]

locales/ar-SA.yml

@@ -348,6 +348,7 @@ invite: "دعوة"
 driveCapacityPerLocalAccount: "حصة التخزين لكل مستخدم محلي"
 driveCapacityPerRemoteAccount: "حصة التخزين لكل مستخدم بعيد"
 inMb: "بالميغابايت"
+iconUrl: "رابط الأيقونة"
 bannerUrl: "رابط صورة اللافتة"
 backgroundImageUrl: "رابط صورة الخلفية"
 basicInfo: "المعلومات الأساسية "
@@ -997,8 +998,6 @@ expirationDate: "تاريخ انتهاء الصلاحية"
 unused: "غير مستعمَل"
 expired: "منتهية صلاحيته"
 icon: "الصورة الرمزية"
-replies: "رد"
-renotes: "أعد النشر"
 _initialAccountSetting:
   accountCreated: "نجح إنشاء حسابك!"
   letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
@@ -1140,7 +1139,6 @@ _plugin:
   install: "ثبّت إضافات"
   installWarn: "رجاءً لا تثبت إضافات غير موثوقة."
   manage: "إدارة الإضافات"
-  viewSource: "اظهر المصدر"
 _preferencesBackups:
   createdAt: "تم إنشاؤه: {date} {time}"
   updatedAt: "آخر تحديث: {date} {time}"
@@ -1184,6 +1182,11 @@ _wordMute:
   muteWords: "الكلمات المحظورة"
   muteWordsDescription: "افصل بينهم بمسافة لاستخدام معامل \"و\" أو بسطر لاستخدام معامل \"أو\"."
   muteWordsDescription2: "احصر الكلمات المفتاحية بين بين شرطتين مائلتين لاستخدامها كتعابير نمطية"
+  softDescription: "اخف الملاحظات التي تستوف الشروط من الخيط الزمني."
+  hardDescription: "اخف الملاحظات التي تستوف الشروط من الخيط الزمني.بالإضافة إلى أن هذه الملاحظات ستبقى مخفية حتى وإن تغيرت الشروط."
+  soft: "لينة"
+  hard: "قاسية"
+  mutedNotes: "الملاحظات المكتومة"
 _instanceMute:
   instanceMuteDescription: "هذه سيحجب كل ملاحظات الخوادم المحجوبة ومشاركاتها والردود على تلك الملاحظات حتى وإن كانت من خادم غير محجوب."
   instanceMuteDescription2: "مدخلة لكل سطر"
@@ -1243,6 +1246,8 @@ _sfx:
   note: "الملاحظات"
   noteMy: "ملاحظتي"
   notification: "الإشعارات"
+  chat: "المحادثة"
+  chatBg: "المحادثة (الخلفية)"
   antenna: "الهوائيات"
   channel: "إشعارات القنات"
 _ago:
@@ -1549,6 +1554,3 @@ _webhookSettings:
   active: "مُفعّل"
   _events:
     reaction: "عند التفاعل"
-_moderationLogTypes:
-  suspend: "علِق"
-  resetPassword: "أعد تعيين كلمتك السرية"

locales/bn-BD.yml

@@ -328,6 +328,7 @@ invite: "আমন্ত্রণ"
 driveCapacityPerLocalAccount: "প্রত্যেক স্থানীয় ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
 driveCapacityPerRemoteAccount: "প্রত্যেক রিমোট ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
 inMb: "মেগাবাইটে লিখুন"
+iconUrl: "আইকনের URL (ফ্যাভিকন, ইত্যাদি)"
 bannerUrl: "ব্যানার ছবির URL"
 backgroundImageUrl: "পটভূমির চিত্রের URL"
 basicInfo: "আপনার ব্যক্তিগত তথ্য"
@@ -838,8 +839,6 @@ color: "রং"
 horizontal: "পাশে"
 youFollowing: "অনুসরণ করা হচ্ছে"
 icon: "প্রোফাইল ছবি"
-replies: "জবাব"
-renotes: "রিনোট"
 _role:
   priority: "অগ্রাধিকার"
   _priority:
@@ -889,7 +888,6 @@ _plugin:
   install: "প্লাগইন ইন্সটল করুন"
   installWarn: "অবিশ্বস্ত প্লাগইন ইনস্টল করবেন না।"
   manage: "প্লাগইন ম্যানেজ করুন"
-  viewSource: "উৎস দেখুন"
 _registry:
   scope: "স্কোপ"
   key: "কী"
@@ -932,6 +930,11 @@ _wordMute:
   muteWords: "নিঃশব্দ করা শব্দগুলি"
   muteWordsDescription: "স্পেস দিয়ে আলাদা করলে AND শর্ত তৈরি হবে এবং আলাদা লাইনে লিখলে OR শর্ত তৈরি হবে।"
   muteWordsDescription2: "রেগুলার এক্সপ্রেশন ব্যবহার করতে স্ল্যাশ দিয়ে কীওয়ার্ডকে ঘিরে রাখুন।"
+  softDescription: "টাইমলাইন থেকে নির্দিষ্ট শর্তানুযায়ী নোট লুকিয়ে রাখে।"
+  hardDescription: "নির্দিষ্ট শর্তানুযায়ী নোটগুলিকে টাইমলাইন থেকে বাদ দেয়। আপনি শর্ত পরিবর্তন করলেও যে নোটগুলি যোগ করা হয়নি সেগুলি বাদ দেওয়া হবে।"
+  soft: "নমনীয়"
+  hard: "কঠোর"
+  mutedNotes: "মিউট করা নোটগুলি"
 _instanceMute:
   instanceMuteDescription: "কনফিগার করা ইন্সট্যান্সের সব নোট এবং রিনোট মিউট করুন, মিউট করা ইন্সট্যান্সের ব্যবহারকারীদের উত্তর সহ।"
   instanceMuteDescription2: "প্রতিটিকে আলাদা লাইনে লিখুন"
@@ -995,6 +998,9 @@ _theme:
     infoFg: "তথ্যের পাঠ্য"
     infoWarnBg: "ওয়ার্নিং এর পটভূমি"
     infoWarnFg: "ওয়ার্নিং এর পাঠ্য"
+    cwBg: "CW বাটনের পটভূমি"
+    cwFg: "CW বাটনের পাঠ্য"
+    cwHoverBg: "CW বাটনের পটভূমি (হভার)"
     toastBg: "বিজ্ঞপ্তির পটভূমি"
     toastFg: "বিজ্ঞপ্তির পাঠ্য"
     buttonBg: "বাটনের পটভূমি"
@@ -1012,6 +1018,8 @@ _sfx:
   note: "নোটগুলি"
   noteMy: "নোট (আপনার)"
   notification: "বিজ্ঞপ্তি"
+  chat: "চ্যাট"
+  chatBg: "চ্যাট (ব্যাকগ্রাউন্ড)"
   antenna: "অ্যান্টেনাগুলি"
   channel: "চ্যানেলের বিজ্ঞপ্তি"
 _ago:
@@ -1323,6 +1331,3 @@ _deck:
 _webhookSettings:
   name: "নাম"
   active: "চালু"
-_moderationLogTypes:
-  suspend: "স্থগিত করা"
-  resetPassword: "পাসওয়ার্ড রিসেট করুন"

locales/ca-ES.yml

@@ -381,8 +381,6 @@ user: "Usuaris"
 global: "Global"
 searchByGoogle: "Cercar"
 file: "Fitxers"
-replies: "Respondre"
-renotes: "Impulsa"
 _role:
   _options:
     antennaMax: "Nombre màxim d'antenes"
@@ -398,6 +396,7 @@ _theme:
 _sfx:
   note: "Notes"
   notification: "Notificacions"
+  chat: "Xat"
   antenna: "Antenes"
 _2fa:
   renewTOTPCancel: "No, gràcies"
@@ -478,6 +477,3 @@ _deck:
     list: "Llistes"
     mentions: "Mencions"
     direct: "Publicacions directes"
-_moderationLogTypes:
-  suspend: "Suspèn"
-  resetPassword: "Restableix la contrasenya"

locales/cs-CZ.yml

@@ -354,6 +354,7 @@ invite: "Pozvat"
 driveCapacityPerLocalAccount: "Kapacita disku na lokálního uživatele"
 driveCapacityPerRemoteAccount: "Kapacita disku na vzdáleného uživatele"
 inMb: "V megabajtech"
+iconUrl: "Favicon URL"
 bannerUrl: "Baner URL"
 backgroundImageUrl: "Adresa URL obrázku pozadí"
 basicInfo: "Základní informace"
@@ -1094,8 +1095,6 @@ doYouAgree: "Souhlasíte?"
 beSureToReadThisAsItIsImportant: "Přečtěte si prosím tyto důležité informace."
 iHaveReadXCarefullyAndAgree: "Přečetl jsem si text \"{x}\" a souhlasím s ním."
 icon: "Avatar"
-replies: "Odpovědět"
-renotes: "Přeposlat"
 _initialAccountSetting:
   accountCreated: "Váš účet byl úspěšně vytvořen!"
   letsStartAccountSetup: "Pro začátek si nastavte svůj profil."
@@ -1113,8 +1112,6 @@ _initialAccountSetting:
   laterAreYouSure: "Opravdu chcete provést nastavení profilu později?"
 _serverRules:
   description: "Soubor pravidel, která se zobrazí před registrací. Doporučuje se nastavit shrnutí podmínek služby."
-_serverSettings:
-  iconUrl: "URL ikony"
 _accountMigration:
   moveFrom: "Migrace jiného účtu na tento účet"
   moveFromSub: "Vytvořit alias na jiný účet"
@@ -1492,7 +1489,6 @@ _plugin:
   install: "Instalovat plugin"
   installWarn: "Neinstalujte nedůvěryhodné pluginy."
   manage: "Správce pluginů"
-  viewSource: "Zobrazit zdroj"
 _preferencesBackups:
   list: "Vytvořit backup"
   saveNew: "Uložit novou zálohu"
@@ -1559,6 +1555,11 @@ _wordMute:
   muteWords: "Ztlumená slova"
   muteWordsDescription: "Podmínku AND oddělujte mezerami, podmínku OR oddělujte řádkovými zlomy."
   muteWordsDescription2: "Chcete-li použít regulární výrazy, obklopte klíčová slova lomítky."
+  softDescription: "Skrýt poznámky, které splňují nastavené podmínky, z časové osy."
+  hardDescription: "Zabrání přidání poznámek splňujících nastavené podmínky na časovou osu. Kromě toho nebudou tyto poznámky přidány na časovou osu, ani když se podmínky změní."
+  soft: "Měkký"
+  hard: "Tvrdý"
+  mutedNotes: "Ztlumené poznámky"
 _instanceMute:
   instanceMuteDescription: "Tímhle se ztlumí všechny poznámky/poznámky z uvedených instancí, včetně poznámek uživatelů, kteří odpovídají uživateli ze ztlumené instance."
   instanceMuteDescription2: "Oddělte novými řádky"
@@ -1622,6 +1623,9 @@ _theme:
     infoFg: "Text informací"
     infoWarnBg: "Pozadí varování"
     infoWarnFg: "Text varování"
+    cwBg: "Pozadí CW tlačítka"
+    cwFg: "Text CW tlačítka"
+    cwHoverBg: "Pozadí CW tlačítka (Hover)"
     toastBg: "Pozadí oznámení"
     toastFg: "Text oznámení"
     buttonBg: "Pozadí tlačítka"
@@ -1639,6 +1643,8 @@ _sfx:
   note: "Poznámky"
   noteMy: "Moje poznámka"
   notification: "Oznámení"
+  chat: "Zprávy"
+  chatBg: "Chat (Pozadí)"
   antenna: "Antény"
   channel: "Oznámení kanálu"
 _ago:
@@ -1670,6 +1676,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "Již jste zaregistrovali dvoufaktorové ověřovací zařízení."
   registerTOTP: "Registrovat aplikaci autentizátoru"
+  passwordToTOTP: "Zadejte své heslo"
   step1: "Nejprve si do zařízení nainstalujte aplikaci pro ověřování (například {a} nebo {b})."
   step2: "Poté naskenujte QR kód zobrazený na této obrazovce."
   step2Click: "Kliknutím na tento QR kód můžete zaregistrovat 2FA do bezpečnostního klíče nebo aplikace autentizace telefonu."
@@ -2026,7 +2033,3 @@ _webhookSettings:
     renote: "Při renotaci poznámky"
     reaction: "Při obdržení reakce"
     mention: "Při zmínce"
-_moderationLogTypes:
-  suspend: "Zmrazit"
-  resetPassword: "Resetovat heslo"
-  createInvitation: "Vygenerovat pozvánku"

locales/de-DE.yml

@@ -2,7 +2,7 @@
 _lang_: "Deutsch"
 headlineMisskey: "Ein durch Notizen verbundenes Netzwerk"
 introMisskey: "Willkommen! Misskey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Notizen“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Notizen anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
-poweredByMisskeyDescription: "{name} ist einer der durch die Open-Source-Plattform <b>Misskey</b> betriebenen Dienste."
+poweredByMisskeyDescription: "{name} ist einer der durch die Open-Source-Plattform <b>Misskey</b> betriebenen Dienste (meist als \"Misskey-Instanz\" bezeichnet)."
 monthAndDay: "{day}.{month}."
 search: "Suchen"
 notifications: "Benachrichtigungen"
@@ -75,7 +75,7 @@ import: "Import"
 export: "Export"
 files: "Dateien"
 download: "Herunterladen"
-driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Einige Inhalte, die diese Datei verwenden, werden auch verschwinden."
+driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Sie wird in allen Inhalten, die sie verwenden, auch verschwinden."
 unfollowConfirm: "Möchtest du {name} wirklich nicht mehr folgen?"
 exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
 importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch nehmen."
@@ -356,6 +356,7 @@ 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"
@@ -418,7 +419,6 @@ moderator: "Moderator"
 moderation: "Moderation"
 moderationNote: "Moderationsnotiz"
 addModerationNote: "Moderationsnotiz hinzufügen"
-moderationLogs: "Moderationsprotokolle"
 nUsersMentioned: "Von {n} Benutzern erwähnt"
 securityKeyAndPasskey: "Hardware-Sicherheitsschlüssel und Passkeys"
 securityKey: "Hardware-Sicherheitsschlüssel"
@@ -640,7 +640,7 @@ display: "Anzeigeart"
 copy: "Kopieren"
 metrics: "Metriken"
 overview: "Übersicht"
-logs: "Protokolle"
+logs: "Logs"
 delayed: "Verzögert"
 database: "Datenbank"
 channel: "Kanäle"
@@ -711,7 +711,6 @@ lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt
 alwaysMarkSensitive: "Medien standardmäßig als sensibel markieren"
 loadRawImages: "Anstatt Vorschaubilder immer Originalbilder anzeigen"
 disableShowingAnimatedImages: "Animierte Bilder nicht abspielen"
-highlightSensitiveMedia: "Sensitive Medien markieren"
 verificationEmailSent: "Eine Bestätigungsmail wurde an deine Email-Adresse versendet. Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
 notSet: "Nicht konfiguriert"
 emailVerified: "Email-Adresse bestätigt"
@@ -915,7 +914,7 @@ typeToConfirm: "Bitte gib zur Bestätigung {x} ein"
 deleteAccount: "Benutzerkonto löschen"
 document: "Dokumentation"
 numberOfPageCache: "Seitencachegröße"
-numberOfPageCacheDescription: "Das Erhöhen dieses Caches führt zu einer angenehmerern Benutzererfahrung, aber erhöht Last und Arbeitsspeicherauslastung auf dem Nutzergerät."
+numberOfPageCacheDescription: "Das Erhöhen dieses Caches führt zu einer angenehmerern Benutzererfahrung, erhöht aber Serverlast und Arbeitsspeicherauslastung."
 logoutConfirm: "Wirklich abmelden?"
 lastActiveDate: "Zuletzt verwendet am"
 statusbar: "Statusleiste"
@@ -1050,7 +1049,7 @@ vertical: "Vertikal"
 horizontal: "Horizontal"
 position: "Position"
 serverRules: "Serverregeln"
-pleaseConfirmBelowBeforeSignup: "Lies bitte diese Informationen und stimme ihnen vor der Registration zu."
+pleaseConfirmBelowBeforeSignup: "Lies bitte Untenstehendes vor der Registration."
 pleaseAgreeAllToContinue: "Zum Fortfahren muss allen obigen Feldern zugestimmt werden."
 continue: "Fortfahren"
 preservedUsernames: "Reservierte Benutzernamen"
@@ -1109,32 +1108,6 @@ 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"
-keepScreenOn: "Bildschirm angeschaltet lassen"
-verifiedLink: "Link-Besitz wurde verifiziert"
-notifyNotes: "Über neue Notizen benachrichtigen"
-unnotifyNotes: "Nicht über neue Notizen benachrichtigen"
-authentication: "Authentifikation"
-authenticationRequiredToContinue: "Bitte authentifiziere dich, um fortzufahren"
-dateAndTime: "Zeit"
-showRenotes: "Renotes anzeigen"
-edited: "Bearbeitet"
-notificationRecieveConfig: "Benachrichtigungseinstellungen"
-mutualFollow: "Gegenseitig gefolgt"
-fileAttachedOnly: "Nur Notizen mit Dateien"
-showRepliesToOthersInTimeline: "Antworten in Chronik anzeigen"
-hideRepliesToOthersInTimeline: "Antworten nicht in Chronik anzeigen"
-externalServices: "Externe Dienste"
-impressum: "Impressum"
-impressumUrl: "Impressums-URL"
-impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung, ist die Angabe von Betreiberinformationen (ein Impressum) bei kommerziellem Betrieb zwingend."
-privacyPolicy: "Datenschutzerklärung"
-privacyPolicyUrl: "Datenschutzerklärungs-URL"
-tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung"
 _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."
@@ -1161,15 +1134,6 @@ _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"
-  shortName: "Abkürzung"
-  shortNameDescription: "Ein Kürzel für den Namen der Instanz, der angezeigt werden kann, falls der volle Instanzname lang ist."
 _accountMigration:
   moveFrom: "Von einem anderen Konto zu diesem migrieren"
   moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1484,7 +1448,6 @@ _role:
     descriptionOfRateLimitFactor: "Je niedriger desto weniger restriktiv, je höher destro restriktiver."
     canHideAds: "Kann Werbung ausblenden"
     canSearchNotes: "Nutzung der Notizsuchfunktion"
-    canUseTranslator: "Verwendung des Übersetzers"
   _condition:
     isLocal: "Lokaler Benutzer"
     isRemote: "Benutzer fremder Instanz"
@@ -1533,10 +1496,6 @@ _ad:
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
   hide: "Ausblenden"
   timezoneinfo: "Der Wochentag wird durch die Serverzeitzone bestimmt."
-  adsSettings: "Werbeeinstellungen"
-  notesPerOneAd: "Werbeintervall während Echtzeitaktualisierung (Notizen pro Werbung)"
-  setZeroToDisable: "Setze dies auf 0, um Werbung während Echtzeitaktualisierung zu deaktivieren"
-  adsTooClose: "Durch den momentan sehr niedrigen Werbeintervall kann es zu einer starken Verschlechterung der Benutzererfahrung kommen."
 _forgotPassword:
   enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
@@ -1555,7 +1514,6 @@ _plugin:
   install: "Plugins installieren"
   installWarn: "Installiere bitte nur vertrauenswürdige Plugins."
   manage: "Plugins verwalten"
-  viewSource: "Quelltext anzeigen"
 _preferencesBackups:
   list: "Erstellte Backups"
   saveNew: "Neu erstellen"
@@ -1622,6 +1580,11 @@ _wordMute:
   muteWords: "Stummgeschaltete Wörter"
   muteWordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen."
   muteWordsDescription2: "Umgib Schlüsselworter mit Schrägstrichen, um Reguläre Ausdrücke zu verwenden."
+  softDescription: "Notizen, die die angegebenen Konditionen erfüllen, in der Chronik ausblenden."
+  hardDescription: "Verhindern, dass Notizen, die die angegebenen Konditionen erfüllen, der Chronik hinzugefügt werden. Zudem werden diese Notizen auch nicht der Chronik hinzugefügt, falls die Konditionen geändert werden."
+  soft: "Leicht"
+  hard: "Schwer"
+  mutedNotes: "Stummgeschaltete Notizen"
 _instanceMute:
   instanceMuteDescription: "Schaltet alle Notizen/Renotes stumm, die von den gelisteten Instanzen stammen, inklusive Antworten von Benutzern an einen Benutzer einer stummgeschalteten Instanz."
   instanceMuteDescription2: "Instanzen getrennt durch Zeilenumbrüchen angeben"
@@ -1685,6 +1648,9 @@ _theme:
     infoFg: "Text von Informationen"
     infoWarnBg: "Hintergrund von Warnungen"
     infoWarnFg: "Text von Warnungen"
+    cwBg: "Hintergrund des Inhaltswarnungsknopfs"
+    cwFg: "Text des Inhaltswarnungsknopfs"
+    cwHoverBg: "Hintergrund des Inhaltswarnungsknopfs (Mouseover)"
     toastBg: "Hintergrund von Benachrichtigungen"
     toastFg: "Text von Benachrichtigungen"
     buttonBg: "Hintergrund von Schaltflächen"
@@ -1702,6 +1668,8 @@ _sfx:
   note: "Notizen"
   noteMy: "Meine Notizen"
   notification: "Benachrichtigungen"
+  chat: "Chat"
+  chatBg: "Chat (Hintergrund)"
   antenna: "Antennen"
   channel: "Kanalbenachrichtigung"
 _ago:
@@ -1733,12 +1701,13 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert."
   registerTOTP: "Authentifizierungs-App registrieren"
+  passwordToTOTP: "Bitte Passwort eingeben"
   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."
   step2Uri: "Nutzt du ein Desktopprogramm, gib folgende URI eingeben"
   step3Title: "Authentifizierungsscode eingeben"
-  step3: "Gib zum Abschluss den Code (Token) ein, der von deiner App angezeigt wird."
+  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 Hardware-Sicherheitsschlüssel."
@@ -1811,7 +1780,6 @@ _antennaSources:
   homeTimeline: "Notizen von Benutzern, denen gefolgt wird"
   users: "Notizen von einem oder mehreren angegebenen Benutzern"
   userList: "Notizen von allen Benutzern einer Liste"
-  userBlacklist: "Alle Notizen abgesehen derer angegebener Benutzer"
 _weekday:
   sunday: "Sonntag"
   monday: "Montag"
@@ -1911,7 +1879,6 @@ _profile:
   metadataContent: "Inhalt"
   changeAvatar: "Profilbild ändern"
   changeBanner: "Banner ändern"
-  verifiedLinkDescription: "Gibst du hier eine URL ein, die einen Link zu deinem Profile enthält, wird neben diesem Feld ein Icon zur Besitzbestätigung angezeigt."
 _exportOrImport:
   allNotes: "Alle Notizen"
   favoritedNotes: "Als Favorit markierte Notizen"
@@ -2030,7 +1997,6 @@ _notification:
   youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten"
   yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert"
   pollEnded: "Umfrageergebnisse sind verfügbar"
-  newNote: "Neue Notiz"
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Push-Benachrichtigungen wurden aktualisiert"
   achievementEarned: "Errungenschaft freigeschaltet"
@@ -2040,7 +2006,6 @@ _notification:
   notificationWillBeDisplayedLikeThis: "Benachrichtigungen sehen so aus"
   _types:
     all: "Alle"
-    note: "Neue Notizen"
     follow: "Neue Follower"
     mention: "Erwähnungen"
     reply: "Antworten"
@@ -2110,42 +2075,3 @@ _webhookSettings:
     renote: "Wenn du ein Renote erhältst"
     reaction: "Wenn du eine Reaktion erhältst"
     mention: "Wenn du erwähnt wirst"
-_moderationLogTypes:
-  createRole: "Rolle erstellt"
-  deleteRole: "Rolle gelöscht"
-  updateRole: "Rolle aktualisiert"
-  assignRole: "Zu Rolle zugewiesen"
-  unassignRole: "Aus Rolle entfernt"
-  suspend: "Gesperrt"
-  unsuspend: "Entsperrt"
-  addCustomEmoji: "Benutzerdefiniertes Emoji hinzugefügt"
-  updateCustomEmoji: "Benutzerdefiniertes Emoji aktualisiert"
-  deleteCustomEmoji: "Benutzerdefiniertes Emoji gelöscht"
-  updateServerSettings: "Servereinstellungen aktualisiert"
-  updateUserNote: "Moderationsnotiz aktualisiert"
-  deleteDriveFile: "Datei gelöscht"
-  deleteNote: "Notiz gelöscht"
-  createGlobalAnnouncement: "Globale Ankündigung erstellt"
-  createUserAnnouncement: "Benutzerspezifische Ankündigung erstellt"
-  updateGlobalAnnouncement: "Globale Ankündigung aktualisiert"
-  updateUserAnnouncement: "Benutzerspezifische Ankündigung aktualisiert"
-  deleteGlobalAnnouncement: "Globale Ankündigung gelöscht"
-  deleteUserAnnouncement: "Benutzerspezifische Ankündigung gelöscht"
-  resetPassword: "Passwort zurückgesetzt"
-  suspendRemoteInstance: "Fremde Instanz gesperrt"
-  unsuspendRemoteInstance: "Fremde Instanz entsperrt"
-  markSensitiveDriveFile: "Datei als sensitiv markiert"
-  unmarkSensitiveDriveFile: "Datei als nicht sensitiv markiert"
-  resolveAbuseReport: "Meldung bearbeitet"
-  createInvitation: "Einladung erstellt"
-  createAd: "Werbung erstellt"
-  deleteAd: "Werbung gelöscht"
-  updateAd: "Werbung aktualisiert"
-_fileViewer:
-  title: "Dateiinformationen"
-  type: "Dateityp"
-  size: "Dateigröße"
-  url: "URL"
-  uploadedAt: "Hochgeladen am"
-  attachedNotes: "Zugehörige Notizen"
-  thisPageCanBeSeenFromTheAuthor: "Nur der Benutzer, der diese Datei hochgeladen hat, kann diese Seite sehen."

locales/el-GR.yml

@@ -288,8 +288,6 @@ file: "Αρχεία"
 recommended: "Προτεινόμενα"
 cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω ανεπαρκούς Αποθηκευτικού Χώρου"
 icon: "Εικονίδιο"
-replies: "Απάντηση"
-renotes: "Κοινοποίηση σημειώματος"
 _email:
   _follow:
     title: "Έχετε ένα νέο ακόλουθο"
@@ -303,6 +301,8 @@ _theme:
 _sfx:
   note: "Σημειώματα"
   notification: "Ειδοποιήσεις"
+  chat: "Συνομιλία"
+  chatBg: "Συνομιλία (Παρασκήνιο)"
   antenna: "Αντένες"
   channel: "Ειδοποιήσεις καναλιών"
 _ago:
@@ -395,5 +395,3 @@ _deck:
     mentions: "Επισημάνσεις"
 _webhookSettings:
   name: "Όνομα"
-_moderationLogTypes:
-  suspend: "Αποβολή"

locales/en-US.yml

@@ -48,7 +48,7 @@ copyLink: "Copy link"
 copyLinkRenote: "Copy renote link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
-deleteAndEditConfirm: "Are you sure you want to redraft this note? This means you will lose all reactions, renotes, and replies to it."
+deleteAndEditConfirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
 addToList: "Add to list"
 addToAntenna: "Add to antenna"
 sendMessage: "Send a message"
@@ -106,7 +106,7 @@ unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
 enterEmoji: "Enter an emoji"
 renote: "Renote"
-unrenote: "Remove renote"
+unrenote: "Take back renote"
 renoted: "Renoted."
 cantRenote: "This post can't be renoted."
 cantReRenote: "A renote can't be renoted."
@@ -356,6 +356,7 @@ 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"
@@ -418,7 +419,6 @@ moderator: "Moderator"
 moderation: "Moderation"
 moderationNote: "Moderation note"
 addModerationNote: "Add moderation note"
-moderationLogs: "Moderation logs"
 nUsersMentioned: "Mentioned by {n} users"
 securityKeyAndPasskey: "Security- and passkeys"
 securityKey: "Security key"
@@ -711,7 +711,6 @@ lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", yo
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 disableShowingAnimatedImages: "Don't play animated images"
-highlightSensitiveMedia: "Highlight sensitive media"
 verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
 notSet: "Not set"
 emailVerified: "Email has been verified"
@@ -915,7 +914,7 @@ typeToConfirm: "Please enter {x} to confirm"
 deleteAccount: "Delete account"
 document: "Documentation"
 numberOfPageCache: "Number of cached pages"
-numberOfPageCacheDescription: "Increasing this number will improve convenience for but cause more load as more memory usage on the user's device."
+numberOfPageCacheDescription: "Increasing this number will improve convenience for users but cause more server load as well as more memory to be used."
 logoutConfirm: "Really log out?"
 lastActiveDate: "Last used at"
 statusbar: "Status bar"
@@ -1109,32 +1108,6 @@ 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"
-keepScreenOn: "Keep screen on"
-verifiedLink: "Link ownership has been verified"
-notifyNotes: "Notify about new notes"
-unnotifyNotes: "Stop notifying about new notes"
-authentication: "Authentication"
-authenticationRequiredToContinue: "Please authenticate to continue"
-dateAndTime: "Timestamp"
-showRenotes: "Show renotes"
-edited: "Edited"
-notificationRecieveConfig: "Notification Settings"
-mutualFollow: "Mutual follow"
-fileAttachedOnly: "Only notes with files"
-showRepliesToOthersInTimeline: "Show replies to others in TL"
-hideRepliesToOthersInTimeline: "Hide replies to others from TL"
-externalServices: "External Services"
-impressum: "Impressum"
-impressumUrl: "Impressum URL"
-impressumDescription: "In some countries, like germany, the inclusion of operator contact information (an Impressum) is legally required for commercial websites."
-privacyPolicy: "Privacy Policy"
-privacyPolicyUrl: "Privacy Policy URL"
-tosAndPrivacyPolicy: "Terms of Service and Privacy Policy"
 _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."
@@ -1161,15 +1134,6 @@ _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"
-  shortName: "Short name"
-  shortNameDescription: "A shorthand for the instance's name that can be displayed if the full official name is long."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -1484,7 +1448,6 @@ _role:
     descriptionOfRateLimitFactor: "Lower rate limits are less restrictive, higher ones more restrictive. "
     canHideAds: "Can hide ads"
     canSearchNotes: "Usage of note search"
-    canUseTranslator: "Translator usage"
   _condition:
     isLocal: "Local user"
     isRemote: "Remote user"
@@ -1533,10 +1496,6 @@ _ad:
   reduceFrequencyOfThisAd: "Show this ad less"
   hide: "Hide"
   timezoneinfo: "The day of the week is determined from the server's timezone."
-  adsSettings: "Ad settings"
-  notesPerOneAd: "Real-time update ad placement interval (Notes per ad)"
-  setZeroToDisable: "Set this value to 0 to disable real-time update ads"
-  adsTooClose: "The current ad interval may significantly worsen the user experience due to being too low."
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1555,7 +1514,6 @@ _plugin:
   install: "Install plugins"
   installWarn: "Please do not install untrustworthy plugins."
   manage: "Manage plugins"
-  viewSource: "View source"
 _preferencesBackups:
   list: "Created backups"
   saveNew: "Save new backup"
@@ -1622,6 +1580,11 @@ _wordMute:
   muteWords: "Muted words"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
+  softDescription: "Hide notes that fulfil the set conditions from the timeline."
+  hardDescription: "Prevents notes fulfilling the set conditions from being added to the timeline. In addition, these notes will not be added to the timeline even if the conditions are changed."
+  soft: "Soft"
+  hard: "Hard"
+  mutedNotes: "Muted notes"
 _instanceMute:
   instanceMuteDescription: "This will mute any notes/renotes from the listed instances, including those of users replying to a user from a muted instance."
   instanceMuteDescription2: "Separate with newlines"
@@ -1685,6 +1648,9 @@ _theme:
     infoFg: "Information text"
     infoWarnBg: "Warning background"
     infoWarnFg: "Warning text"
+    cwBg: "CW button background"
+    cwFg: "CW button text"
+    cwHoverBg: "CW button background (Hover)"
     toastBg: "Notification background"
     toastFg: "Notification text"
     buttonBg: "Button background"
@@ -1702,6 +1668,8 @@ _sfx:
   note: "New note"
   noteMy: "Own note"
   notification: "Notifications"
+  chat: "Chat"
+  chatBg: "Chat (Background)"
   antenna: "Antennas"
   channel: "Channel notifications"
 _ago:
@@ -1733,6 +1701,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
   registerTOTP: "Register authenticator app"
+  passwordToTOTP: "Enter your password"
   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."
@@ -1811,7 +1780,6 @@ _antennaSources:
   homeTimeline: "Notes from followed users"
   users: "Notes from specific users"
   userList: "Notes from a specified list of users"
-  userBlacklist: "All notes except for those of one or more specified users"
 _weekday:
   sunday: "Sunday"
   monday: "Monday"
@@ -1911,7 +1879,6 @@ _profile:
   metadataContent: "Content"
   changeAvatar: "Change avatar"
   changeBanner: "Change banner"
-  verifiedLinkDescription: "By entering an URL that contains a link to your profile here, an ownership verification icon can be displayed next to the field."
 _exportOrImport:
   allNotes: "All notes"
   favoritedNotes: "Favorite notes"
@@ -2030,7 +1997,6 @@ _notification:
   youReceivedFollowRequest: "You've received a follow request"
   yourFollowRequestAccepted: "Your follow request was accepted"
   pollEnded: "Poll results have become available"
-  newNote: "New note"
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Push notifications have been updated"
   achievementEarned: "Achievement unlocked"
@@ -2040,7 +2006,6 @@ _notification:
   notificationWillBeDisplayedLikeThis: "Notifications look like this"
   _types:
     all: "All"
-    note: "New notes"
     follow: "New followers"
     mention: "Mentions"
     reply: "Replies"
@@ -2110,42 +2075,3 @@ _webhookSettings:
     renote: "When renoted"
     reaction: "When receiving a reaction"
     mention: "When being mentioned"
-_moderationLogTypes:
-  createRole: "Role created"
-  deleteRole: "Role deleted"
-  updateRole: "Role updated"
-  assignRole: "Assigned to role"
-  unassignRole: "Removed from role"
-  suspend: "Suspended"
-  unsuspend: "Unsuspended"
-  addCustomEmoji: "Custom emoji added"
-  updateCustomEmoji: "Custom emoji updated"
-  deleteCustomEmoji: "Custom emoji deleted"
-  updateServerSettings: "Server settings updated"
-  updateUserNote: "Moderation note updated"
-  deleteDriveFile: "File deleted"
-  deleteNote: "Note deleted"
-  createGlobalAnnouncement: "Global announcement created"
-  createUserAnnouncement: "User announcement created"
-  updateGlobalAnnouncement: "Global announcement updated"
-  updateUserAnnouncement: "User announcement updated"
-  deleteGlobalAnnouncement: "Global announcement deleted"
-  deleteUserAnnouncement: "User announcement deleted"
-  resetPassword: "Password reset"
-  suspendRemoteInstance: "Remote instance suspended"
-  unsuspendRemoteInstance: "Remote instance unsuspended"
-  markSensitiveDriveFile: "File marked as sensitive"
-  unmarkSensitiveDriveFile: "File unmarked as sensitive"
-  resolveAbuseReport: "Report resolved"
-  createInvitation: "Invite generated"
-  createAd: "Ad created"
-  deleteAd: "Ad deleted"
-  updateAd: "Ad updated"
-_fileViewer:
-  title: "File details"
-  type: "File type"
-  size: "Filesize"
-  url: "URL"
-  uploadedAt: "Uploaded at"
-  attachedNotes: "Attached notes"
-  thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file."

locales/es-ES.yml

@@ -20,7 +20,7 @@ noNotes: "No hay notas"
 noNotifications: "No hay notificaciones"
 instance: "Instancia"
 settings: "Configuración"
-notificationSettings: "Ajustes de notificaciones"
+notificationSettings: "Configurar las notificaciones"
 basicSettings: "Configuración básica"
 otherSettings: "Configuración avanzada"
 openInWindow: "Abrir en una ventana"
@@ -56,8 +56,8 @@ copyRSS: "Copiar RSS"
 copyUsername: "Copiar nombre de usuario"
 copyUserId: "Copiar ID del usuario"
 copyNoteId: "Copiar ID de la nota"
-copyFileId: "Copiar ID del archivo"
-copyFolderId: "Copiar ID de carpeta"
+copyFileId: "Copiar un archivo ID"
+copyFolderId: "Copiar carpeta ID"
 copyProfileUrl: "Copiar la URL del perfil"
 searchUser: "Buscar un usuario"
 reply: "Responder"
@@ -356,6 +356,7 @@ 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"
@@ -416,9 +417,6 @@ 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"
-moderationLogs: "Log de moderación"
 nUsersMentioned: "{n} usuarios mencionados"
 securityKeyAndPasskey: "Clave de seguridad / clave de paso"
 securityKey: "Clave de seguridad"
@@ -711,7 +709,6 @@ lockedAccountInfo: "A menos que configures la visibilidad de tus notas como \"S
 alwaysMarkSensitive: "Marcar los medios de comunicación como contenido sensible por defecto"
 loadRawImages: "Cargar las imágenes originales en lugar de mostrar las miniaturas"
 disableShowingAnimatedImages: "No reproducir imágenes animadas"
-highlightSensitiveMedia: "Resaltar medios marcados como sensibles"
 verificationEmailSent: "Se le ha enviado un correo electrónico de confirmación. Por favor, acceda al enlace proporcionado en el correo electrónico para completar la configuración."
 notSet: "Sin especificar"
 emailVerified: "Su dirección de correo electrónico ha sido verificada."
@@ -1109,18 +1106,6 @@ 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"
-loadReplies: "Ver respuestas"
-loadConversation: "Ver conversación"
-pinnedList: "Lista fijada"
-keepScreenOn: "Mantener pantalla encendida"
-verifiedLink: "Propiedad del enlace verificada"
-notifyNotes: "Notificar nuevas notas"
-unnotifyNotes: "Dejar de notificar nuevas notas"
-authentication: "Autenticación"
-authenticationRequiredToContinue: "Por favor, autentifícate para continuar"
-dateAndTime: "Fecha y hora"
 _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."
@@ -1147,15 +1132,6 @@ _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"
-  appIconDescription: "Indica el icono que se va a usar cuando {host} se muestre como una app."
-  appIconUsageExample: "Por ejemplo, como PWA o cuando se muestre como un marcador en la pantalla inicial del dispositivo"
-  appIconStyleRecommendation: "Como el icono puede ser recortado como un cuadrado o un círculo, se recomienda un icono con un margen coloreado alrededor del contenido."
-  appIconResolutionMustBe: "La resolución mínima es {resolution}."
-  manifestJsonOverride: "Sobreescribir manifest.json"
-  shortName: "Nombre corto"
-  shortNameDescription: "Forma corta del nombre de la instancia que puede mostrarse si el nombre completo es demasiado largo."
 _accountMigration:
   moveFrom: "Trasladar de otra cuenta a ésta"
   moveFromSub: "Crear un alias para otra cuenta."
@@ -1410,9 +1386,6 @@ _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"
@@ -1536,7 +1509,6 @@ _plugin:
   install: "Instalar plugins"
   installWarn: "Por favor no instale plugins que no son de confianza"
   manage: "Gestionar plugins"
-  viewSource: "Ver la fuente"
 _preferencesBackups:
   list: "Respaldos creados"
   saveNew: "Guardar nuevo respaldo"
@@ -1603,6 +1575,11 @@ _wordMute:
   muteWords: "Palabras que silenciar"
   muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。"
   muteWordsDescription2: "Encerrar las palabras clave entre numerales para usar expresiones regulares"
+  softDescription: "Ocultar en la linea de tiempo las notas que cumplen las condiciones"
+  hardDescription: "Evitar que se agreguen a la linea de tiempo las notas que cumplen las condiciones. Las notas no agregadas seguirán quitadas aunque cambien las condiciones."
+  soft: "Suave"
+  hard: "Duro"
+  mutedNotes: "Notas silenciadas"
 _instanceMute:
   instanceMuteDescription: "Silencia todas las notas y reposts de la instancias seleccionadas, incluyendo respuestas a los usuarios de las mismas"
   instanceMuteDescription2: "Separar por líneas"
@@ -1666,6 +1643,9 @@ _theme:
     infoFg: "Texto de información"
     infoWarnBg: "Fondo de advertencias"
     infoWarnFg: "Texto de advertencias"
+    cwBg: "Fondo del botón CW"
+    cwFg: "Texto del botón CW"
+    cwHoverBg: "Fondo del botón CW (hover)"
     toastBg: "Fondo de notificaciones"
     toastFg: "Texto de notificaciones"
     buttonBg: "Fondo de botón"
@@ -1683,6 +1663,8 @@ _sfx:
   note: "Notas"
   noteMy: "Nota (a mí mismo)"
   notification: "Notificaciones"
+  chat: "Chat"
+  chatBg: "Chat (Fondo)"
   antenna: "Antena receptora"
   channel: "Notificaciones del canal"
 _ago:
@@ -1714,6 +1696,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "Ya has completado la configuración."
   registerTOTP: "Registrar aplicación autenticadora"
+  passwordToTOTP: "Ingresa tu contraseña"
   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."
@@ -1792,7 +1775,6 @@ _antennaSources:
   homeTimeline: "Notas de los usuarios que sigues"
   users: "Notas de un usuario o varios"
   userList: "Notas de los usuarios de una lista"
-  userBlacklist: "Todas las notas excepto aquellas de uno o más usuarios especificados"
 _weekday:
   sunday: "Domingo"
   monday: "Lunes"
@@ -1892,7 +1874,6 @@ _profile:
   metadataContent: "Contenido"
   changeAvatar: "Cambiar avatar"
   changeBanner: "Cambiar banner"
-  verifiedLinkDescription: "Introduciendo una URL que contiene un enlace a tu perfil, se puede mostrar un icono de verificación de propiedad al lado del campo."
 _exportOrImport:
   allNotes: "Todas las notas"
   favoritedNotes: "Notas favoritas"
@@ -2011,17 +1992,11 @@ _notification:
   youReceivedFollowRequest: "Has mandado una solicitud de seguimiento"
   yourFollowRequestAccepted: "Tu solicitud de seguimiento fue aceptada"
   pollEnded: "Estan disponibles los resultados de la encuesta"
-  newNote: "Nueva nota"
   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"
-    note: "Nuevas notas"
     follow: "Siguiendo"
     mention: "Menciones"
     reply: "Respuestas"
@@ -2091,31 +2066,3 @@ _webhookSettings:
     renote: "Cuando reciba un \"re-note\""
     reaction: "Cuando se recibe una reacción"
     mention: "Cuando hay una mención"
-_moderationLogTypes:
-  createRole: "Rol creado"
-  deleteRole: "Rol eliminado"
-  updateRole: "Rol actualizado"
-  assignRole: "Rol asignado"
-  unassignRole: "Rol retirado"
-  suspend: "Suspender"
-  unsuspend: "Suspensión retirada"
-  addCustomEmoji: "Añadido emoji personalizado"
-  updateCustomEmoji: "Emoji personalizado actualizado"
-  deleteCustomEmoji: "Emoji personalizado eliminado"
-  updateServerSettings: "Ajustes de servidor actualizados"
-  updateUserNote: "Nota de moderación actualizada"
-  deleteDriveFile: "Archivo eliminado"
-  deleteNote: "Nota eliminada"
-  createGlobalAnnouncement: "Anuncio global creado"
-  createUserAnnouncement: "Anuncio de usuario creado"
-  updateGlobalAnnouncement: "Anuncio global actualizado"
-  updateUserAnnouncement: "Anuncio de usuario actualizado"
-  deleteGlobalAnnouncement: "Anuncio global eliminado"
-  deleteUserAnnouncement: "Anuncio de usuario eliminado"
-  resetPassword: "Resetear contraseña"
-  suspendRemoteInstance: "Instancia remota suspendida"
-  unsuspendRemoteInstance: "Suspensión de instancia remota retirada"
-  markSensitiveDriveFile: "Archivo marcado como sensible"
-  unmarkSensitiveDriveFile: "Archivo marcado como no sensible"
-  resolveAbuseReport: "Reporte resuelto"
-  createInvitation: "Generar invitación"

locales/fr-FR.yml

@@ -45,10 +45,9 @@ pin: "Épingler sur le profil"
 unpin: "Désépingler"
 copyContent: "Copier le contenu"
 copyLink: "Copier le lien"
-copyLinkRenote: "Copier le lien de la renote"
 delete: "Supprimer"
 deleteAndEdit: "Supprimer et réécrire"
-deleteAndEditConfirm: "Êtes-vous sûr de vouloir effacer cette note et la modifier ? Vous perdrez toutes les réactions, renotes et réponses."
+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."
 addToList: "Ajouter à une liste"
 addToAntenna: "Ajouter à l’antenne"
 sendMessage: "Envoyer un message"
@@ -130,8 +129,6 @@ unmarkAsSensitive: "Supprimer le marquage comme sensible"
 enterFileName: "Entrer le nom du fichier"
 mute: "Masquer"
 unmute: "Ne plus masquer"
-renoteMute: "Masquer les renotes"
-renoteUnmute: "Ne plus masquer les renotes"
 block: "Bloquer"
 unblock: "Débloquer"
 suspend: "Suspendre"
@@ -275,7 +272,6 @@ startMessaging: "Commencer à discuter"
 nUsersRead: "Lu par {n} personnes"
 agreeTo: "J’accepte {0}"
 agree: "Accepter"
-agreeBelow: "J’accepte ce qui suit"
 basicNotesBeforeCreateAccount: "Notes importantes"
 termsOfService: "Conditions d'utilisation"
 start: "Commencer"
@@ -355,6 +351,7 @@ 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"
@@ -410,16 +407,13 @@ aboutMisskey: "À propos de Misskey"
 administrator: "Administrateur"
 token: "Jeton"
 2fa: "Authentification à deux facteurs"
-setupOf2fa: "Configuration de l’authentification à deux facteurs"
 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"
-moderationLogs: "Journal de modération"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
-securityKeyAndPasskey: "Sécurité et clés de sécurité"
 securityKey: "Clé de sécurité"
 lastUsed: "Dernier utilisé"
 lastUsedAt: "Dernière utilisation : {t}"
@@ -476,7 +470,6 @@ aboutX: "À propos de {x}"
 emojiStyle: "Style des émojis"
 native: "Natif"
 disableDrawer: "Les menus ne s'affichent pas dans le tiroir"
-showNoteActionsOnlyHover: "Afficher les actions de note uniquement au survol"
 noHistory: "Pas d'historique"
 signinHistory: "Historique de connexion"
 enableAdvancedMfm: "Activer la MFM avancée"
@@ -488,7 +481,6 @@ createAccount: "Créer un compte"
 existingAccount: "Compte existant"
 regenerate: "Générer à nouveau"
 fontSize: "Taille de la police"
-limitTo: "Limiter à {x}"
 noFollowRequests: "Vous n’avez aucune demande d’abonnement en attente"
 openImageInNewTab: "Ouvrir les images dans un nouvel onglet"
 dashboard: "Tableau de bord"
@@ -652,7 +644,6 @@ behavior: "Comportement"
 sample: "Exemple"
 abuseReports: "Signalements"
 reportAbuse: "Signaler"
-reportAbuseRenote: "Signaler la renote"
 reportAbuseOf: "Signaler {name}"
 fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
 abuseReported: "Le rapport est envoyé. Merci."
@@ -677,8 +668,6 @@ clip: "Clip"
 createNew: "Créer nouveau"
 optional: "Facultatif"
 createNewClip: "Créer un nouveau clip"
-unclip: "Supprimer le clip"
-confirmToUnclipAlreadyClippedNote: "Cette note fait déjà partie du clip « {name} ». Souhaitez-vous la supprimer de ce clip ?"
 public: "Public"
 private: "Privé"
 i18nInfo: "Misskey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
@@ -808,7 +797,6 @@ popularPosts: "Les plus consultées"
 shareWithNote: "Partager dans une note"
 ads: "Publicité"
 expiration: "Échéance"
-startingperiod: "Commencer"
 memo: "Pense-bête"
 priority: "Priorité"
 high: "Haute"
@@ -941,15 +929,12 @@ unsubscribePushNotification: "Désactiver les notifications push"
 pushNotificationAlreadySubscribed: "Les notifications push sont déjà activées"
 pushNotificationNotSupported: "Votre navigateur ou votre instance ne prend pas en charge les notifications push"
 sendPushNotificationReadMessage: "Supprimer les notifications push une fois que les notifications ou messages pertinents ont été lus."
-windowMaximize: "Maximiser"
-windowMinimize: "Minimaliser"
 windowRestore: "Restaurer"
 caption: "Libellé"
 loggedInAsBot: "Connecté actuellement en tant que bot"
 tools: "Outils"
 cannotLoad: "Chargement impossible"
 like: "J'aime"
-unlike: "Ne plus aimer"
 numberOfLikes: "Favoris"
 show: "Affichage"
 neverShow: "Ne plus afficher"
@@ -960,7 +945,6 @@ noRole: "Aucun rôle"
 normalUser: "Simple utilisateur·rice"
 undefined: "Non défini"
 assign: "Attribuer"
-unassign: "Retirer"
 color: "Couleur"
 manageCustomEmojis: "Gestion des émojis personnalisés"
 preset: "Préréglage"
@@ -970,16 +954,11 @@ thisPostMayBeAnnoying: "Cette note peut gêner d'autres personnes."
 thisPostMayBeAnnoyingHome: "Publier vers le fil principal"
 thisPostMayBeAnnoyingCancel: "Annuler"
 thisPostMayBeAnnoyingIgnore: "Publier quand-même"
-collapseRenotes: "Réduire les renotes déjà vues"
 internalServerError: "Erreur interne du serveur"
 copyErrorInfo: "Copier les détails de l’erreur"
 exploreOtherServers: "Trouver une autre instance"
 disableFederationOk: "Désactiver"
-likeOnly: "Les favoris uniquement"
-sensitiveWords: "Mots sensibles"
-notesSearchNotAvailable: "La recherche de notes n'est pas disponible."
 license: "Licence"
-myClips: "Mes clips"
 video: "Vidéo"
 videos: "Vidéos"
 dataSaver: "Économiseur de données"
@@ -989,7 +968,6 @@ accountMovedShort: "Ce compte a migré"
 operationForbidden: "Opération non autorisée"
 addMemo: "Ajouter un mémo"
 reactionsList: "Réactions"
-renotesList: "Liste de renotes"
 notificationDisplay: "Style des notifications"
 leftTop: "En haut à gauche"
 rightTop: "En haut à droite"
@@ -999,9 +977,7 @@ vertical: "Vertical"
 horizontal: "Latéral"
 serverRules: "Règles du serveur"
 archive: "Archive"
-displayOfNote: "Affichage de la note"
 youFollowing: "Abonné·e"
-options: "Options"
 later: "Plus tard"
 goToMisskey: "Retour vers Misskey"
 expirationDate: "Date d’expiration"
@@ -1012,27 +988,12 @@ expired: "Expiré"
 doYouAgree: "Êtes-vous d’accord ?"
 icon: "Avatar"
 forYou: "Pour vous"
-replies: "Répondre"
-renotes: "Renoter"
-loadReplies: "Inclure les réponses"
-pinnedList: "Liste épinglée"
-notifyNotes: "Notifier à propos des nouvelles notes"
-authentication: "Authentification"
-authenticationRequiredToContinue: "Veuillez vous authentifier pour continuer"
-showRenotes: "Afficher les renotes"
 _announcement:
   readConfirmTitle: "Marquer comme lu ?"
 _initialAccountSetting:
   profileSetting: "Paramètres du profil"
   privacySetting: "Paramètres de confidentialité"
-  initialAccountSettingCompleted: "Configuration du profil terminée avec succès !"
-  ifYouNeedLearnMore: "Si vous voulez en savoir plus comment utiliser {name}(Misskey), veuillez visiter {link}."
-  skipAreYouSure: "Désirez-vous ignorer la configuration du profile ?"
-_serverSettings:
-  iconUrl: "URL de l’icône"
 _accountMigration:
-  moveFrom: "Migrer un autre compte vers le présent compte"
-  moveFromSub: "Créer un alias vers un autre compte"
   moveToLabel: "Compte vers lequel vous migrez :"
   startMigration: "Migrer"
   movedTo: "Compte vers lequel vous migrez :"
@@ -1089,41 +1050,20 @@ _achievements:
     _login1000:
       flavor: "Merci d'utiliser Misskey !"
     _profileFilled:
-      title: "Bien préparé"
       description: "Configuration de votre profil"
     _markedAsCat:
       title: "Je suis un chat"
-      description: "Rendre votre compte comme un chat"
       flavor: "Je n'ai pas encore de nom"
-    _following1:
-      title: "Vous suivez votre premier utilisateur·rice"
     _following50:
       title: "Beaucoup d'amis"
     _followers10:
       title: "Abonnez-moi !"
-      description: "Obtenir plus de 10 abonné·e·s"
-    _followers50:
-      description: "Obtenir plus de 50 abonné·e·s"
-    _followers100:
-      title: "Populaire"
-      description: "Obtenir plus de 100 abonné·e·s"
-    _followers300:
-      description: "Obtenir plus de 300 abonné·e·s"
-    _followers500:
-      title: "Tour radio"
-      description: "Obtenir plus de 500 abonné·e·s"
-    _followers1000:
-      title: "Influenceur·euse"
-      description: "Obtenir plus de 1000 abonné·e·s"
     _iLoveMisskey:
       title: "J’adore Misskey"
       description: "Publication « J’❤ #Misskey »"
-      flavor: "L'équipe de développement de Misskey apprécie vraiment votre aide !"
     _foundTreasure:
       title: "Chasse au trésor"
       description: "Vous avez trouvé le trésor caché"
-    _client30min:
-      title: "Pause bien méritée"
     _postedAtLateNight:
       flavor: "C’est l’heure d’aller au lit."
     _postedAt0min0sec:
@@ -1132,45 +1072,18 @@ _achievements:
       flavor: "Tic tac, tic tac, tic tac, ding !"
     _viewInstanceChart:
       title: "Analyste"
-    _outputHelloWorldOnScratchpad:
-      title: "Bonjour tout le monde !"
-    _open3windows:
-      title: "Multi-fenêtres"
-    _driveFolderCircularReference:
-      title: "Référence circulaire"
-    _setNameToSyuilo:
-      description: "Vous avez spécifié « syuilo » comme nom"
-    _passedSinceAccountCreated1:
-      title: "Premier anniversaire"
-    _passedSinceAccountCreated2:
-      title: "Second anniversaire"
-    _passedSinceAccountCreated3:
-      title: "3ème anniversaire"
     _loggedInOnBirthday:
       title: "Joyeux Anniversaire !"
-      description: "Vous vous êtes connecté à la date de votre anniversaire"
     _loggedInOnNewYearsDay:
       title: "Bonne année !"
     _cookieClicked:
       flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
-    _brainDiver:
-      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
-  new: "Nouveau rôle"
-  edit: "Modifier le rôle"
   name: "Nom du rôle"
   description: "Description du rôle"
   permission: "Rôle et autorisations"
   assignTarget: "Attribuer"
   condition: "Condition"
-  isPublic: "Rôle public"
-  options: "Options"
-  policies: "Stratégies"
-  baseRole: "Modèle de rôle"
-  useBaseValue: "Utiliser la valeur du modèle de rôle"
-  chooseRoleToAssign: "Sélectionner le rôle à assigner"
-  iconUrl: "URL de l’icône"
-  displayOrder: "Classement"
   priority: "Priorité"
   _priority:
     low: "Basse"
@@ -1178,7 +1091,6 @@ _role:
     high: "Haute"
   _options:
     canManageCustomEmojis: "Gestion des émojis personnalisés"
-    wordMuteMax: "Nombre maximal de caractères dans le filtre de mots"
 _sensitiveMediaDetection:
   description: "L'apprentissage automatique peut être utilisé pour détecter automatiquement les médias sensibles à modérer. La sollicitation des serveurs augmente légèrement."
   sensitivity: "Sensibilité de la détection"
@@ -1230,7 +1142,6 @@ _plugin:
   install: "Installation de plugin"
   installWarn: "N’installez que des extensions provenant de sources de confiance."
   manage: "Gestion des plugins"
-  viewSource: "Afficher la source"
 _preferencesBackups:
   list: "Sauvegardes créées"
   saveNew: "Nouvelle sauvegarde"
@@ -1295,6 +1206,11 @@ _wordMute:
   muteWords: "Mots à filtrer"
   muteWordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
   muteWordsDescription2: "Pour utiliser des expressions régulières (regex), mettez les mots-clés entre barres obliques."
+  softDescription: "Masquez les notes de votre fil selon les paramètres que vous définissez."
+  hardDescription: "Empêchez votre fil de charger les notes selon les paramètres que vous définissez. Cette action est irréversible : si vous modifiez ces paramètres plus tard, les notes précédemment filtrées ne seront pas récupérées."
+  soft: "Doux"
+  hard: "Strict"
+  mutedNotes: "Notes filtrées"
 _instanceMute:
   instanceMuteDescription: "Met en sourdine toutes les notes et renotes de l'instance configurée, y compris les réponses aux utilisateurs de l'instance muette."
   instanceMuteDescription2: "Séparer avec de nouvelles lignes"
@@ -1358,6 +1274,9 @@ _theme:
     infoFg: "Texte d'information"
     infoWarnBg: "Arrière-plan des avertissements"
     infoWarnFg: "Texte d’avertissement"
+    cwBg: "Arrière-plan du CW"
+    cwFg: "Texte du bouton CW"
+    cwHoverBg: "Arrière-plan du bouton CW (survolé)"
     toastBg: "Arrière-plan de la bulle de notification"
     toastFg: "Texte de la bulle de notification"
     buttonBg: "Arrière-plan du bouton"
@@ -1375,6 +1294,8 @@ _sfx:
   note: "Nouvelle note"
   noteMy: "Ma note"
   notification: "Notifications"
+  chat: "Discuter"
+  chatBg: "Discussion (arrière-plan)"
   antenna: "Réception de l’antenne"
   channel: "Notifications de canal"
 _ago:
@@ -1407,7 +1328,6 @@ _2fa:
   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é"
-  removeKey: "Supprimer la clé de sécurité"
   removeKeyConfirm: "Voulez-vous supprimer {name} ?"
   renewTOTPOk: "Reconfigurer"
   renewTOTPCancel: "Pas maintenant"
@@ -1709,6 +1629,3 @@ _deck:
 _webhookSettings:
   name: "Nom"
   active: "Activé"
-_moderationLogTypes:
-  suspend: "Suspendre"
-  resetPassword: "Réinitialiser le mot de passe"

locales/hu-HU.yml

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

locales/id-ID.yml

@@ -354,6 +354,7 @@ 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"
@@ -1098,9 +1099,6 @@ icon: "Avatar"
 forYou: "Untuk Anda"
 currentAnnouncements: "Pengumuman Saat Ini"
 pastAnnouncements: "Pengumuman Terdahulu"
-replies: "Balas"
-renotes: "Renote"
-dateAndTime: "Tanggal dan Waktu"
 _initialAccountSetting:
   accountCreated: "Akun kamu telah sukses dibuat!"
   letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
@@ -1118,8 +1116,6 @@ _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"
@@ -1497,7 +1493,6 @@ _plugin:
   install: "Memasang plugin"
   installWarn: "Mohon jangan memasang plugin yang tidak dapat dipercayai."
   manage: "Manajemen plugin"
-  viewSource: "Lihat sumber"
 _preferencesBackups:
   list: "Cadangan yang dibuat"
   saveNew: "Simpan cadangan baru"
@@ -1564,6 +1559,11 @@ _wordMute:
   muteWords: "Kata yang dibisukan"
   muteWordsDescription: "Pisahkan dengan spasi untuk kondisi AND. Pisahkan dengan baris baru untuk kondisi OR."
   muteWordsDescription2: "Kurung kata kunci dengan garis miring untuk menggunakan ekspresi reguler."
+  softDescription: "Sembunyikan catatan yang memenuhi aturan kondisi dari lini masa."
+  hardDescription: "Cegah catatan memenuhi aturan kondisi dari ditambahkan ke lini masa. Dengan tambahan, catatan berikut tidak akan ditambahkan ke lini masa meskipun jika kondisi tersebut diubah."
+  soft: "Lembut"
+  hard: "Keras"
+  mutedNotes: "Catatan yang dibisukan"
 _instanceMute:
   instanceMuteDescription: "Pengaturan ini akan membisukan note/renote apa saja dari instansi yang terdaftar, termasuk pengguna yang membalas pengguna lain dalam instansi yang dibisukan."
   instanceMuteDescription2: "Pisah dengan baris baru"
@@ -1627,6 +1627,9 @@ _theme:
     infoFg: "Teks informasi"
     infoWarnBg: "Latar belakang peringatan"
     infoWarnFg: "Teks peringatan"
+    cwBg: "Latar belakang tombol Sembunyikan Konten"
+    cwFg: "Teks tombol Sembunyikan Konten"
+    cwHoverBg: "Latar belakang tombol Sembunyikan Konten (Mengambang)"
     toastBg: "Latar belakang notifikasi"
     toastFg: "Teks notifikasi"
     buttonBg: "Latar belakang tombol"
@@ -1644,6 +1647,8 @@ _sfx:
   note: "Catatan"
   noteMy: "Catatan (Saya)"
   notification: "Notifikasi"
+  chat: "Pesan"
+  chatBg: "Obrolan (Latar Belakang)"
   antenna: "Penerimaan Antenna"
   channel: "Notifikasi Kanal"
 _ago:
@@ -1675,6 +1680,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
   registerTOTP: "Daftarkan aplikasi autentikator"
+  passwordToTOTP: "Masukkan kata sandimu"
   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."
@@ -2032,7 +2038,3 @@ _webhookSettings:
     renote: "Ketika direnote"
     reaction: "Ketika menerima reaksi"
     mention: "Ketika sedang disebut"
-_moderationLogTypes:
-  suspend: "Tangguhkan"
-  resetPassword: "Atur ulang kata sandi"
-  createInvitation: "Buat kode undangan"

locales/index.d.ts

@@ -421,7 +421,6 @@ export interface Locale {
     "moderation": string;
     "moderationNote": string;
     "addModerationNote": string;
-    "moderationLogs": string;
     "nUsersMentioned": string;
     "securityKeyAndPasskey": string;
     "securityKey": string;
@@ -714,7 +713,6 @@ export interface Locale {
     "alwaysMarkSensitive": string;
     "loadRawImages": string;
     "disableShowingAnimatedImages": string;
-    "highlightSensitiveMedia": string;
     "verificationEmailSent": string;
     "notSet": string;
     "emailVerified": string;
@@ -1112,32 +1110,6 @@ export interface Locale {
     "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;
-    "dateAndTime": string;
-    "showRenotes": string;
-    "edited": string;
-    "notificationRecieveConfig": string;
-    "mutualFollow": string;
-    "fileAttachedOnly": string;
-    "showRepliesToOthersInTimeline": string;
-    "hideRepliesToOthersInTimeline": string;
-    "externalServices": string;
-    "impressum": string;
-    "impressumUrl": string;
-    "impressumDescription": string;
-    "privacyPolicy": string;
-    "privacyPolicyUrl": string;
-    "tosAndPrivacyPolicy": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;
@@ -1174,8 +1146,6 @@ export interface Locale {
         "appIconStyleRecommendation": string;
         "appIconResolutionMustBe": string;
         "manifestJsonOverride": string;
-        "shortName": string;
-        "shortNameDescription": string;
     };
     "_accountMigration": {
         "moveFrom": string;
@@ -1570,7 +1540,6 @@ export interface Locale {
             "descriptionOfRateLimitFactor": string;
             "canHideAds": string;
             "canSearchNotes": string;
-            "canUseTranslator": string;
         };
         "_condition": {
             "isLocal": string;
@@ -1627,10 +1596,6 @@ export interface Locale {
         "reduceFrequencyOfThisAd": string;
         "hide": string;
         "timezoneinfo": string;
-        "adsSettings": string;
-        "notesPerOneAd": string;
-        "setZeroToDisable": string;
-        "adsTooClose": string;
     };
     "_forgotPassword": {
         "enterEmail": string;
@@ -1655,7 +1620,6 @@ export interface Locale {
         "install": string;
         "installWarn": string;
         "manage": string;
-        "viewSource": string;
     };
     "_preferencesBackups": {
         "list": string;
@@ -1731,6 +1695,11 @@ export interface Locale {
         "muteWords": string;
         "muteWordsDescription": string;
         "muteWordsDescription2": string;
+        "softDescription": string;
+        "hardDescription": string;
+        "soft": string;
+        "hard": string;
+        "mutedNotes": string;
     };
     "_instanceMute": {
         "instanceMuteDescription": string;
@@ -1796,6 +1765,9 @@ export interface Locale {
             "infoFg": string;
             "infoWarnBg": string;
             "infoWarnFg": string;
+            "cwBg": string;
+            "cwFg": string;
+            "cwHoverBg": string;
             "toastBg": string;
             "toastFg": string;
             "buttonBg": string;
@@ -1815,6 +1787,8 @@ export interface Locale {
         "note": string;
         "noteMy": string;
         "notification": string;
+        "chat": string;
+        "chatBg": string;
         "antenna": string;
         "channel": string;
     };
@@ -1850,6 +1824,7 @@ export interface Locale {
     "_2fa": {
         "alreadyRegistered": string;
         "registerTOTP": string;
+        "passwordToTOTP": string;
         "step1": string;
         "step2": string;
         "step2Click": string;
@@ -1931,7 +1906,6 @@ export interface Locale {
         "homeTimeline": string;
         "users": string;
         "userList": string;
-        "userBlacklist": string;
     };
     "_weekday": {
         "sunday": string;
@@ -2040,7 +2014,6 @@ export interface Locale {
         "metadataContent": string;
         "changeAvatar": string;
         "changeBanner": string;
-        "verifiedLinkDescription": string;
     };
     "_exportOrImport": {
         "allNotes": string;
@@ -2169,7 +2142,6 @@ export interface Locale {
         "youReceivedFollowRequest": string;
         "yourFollowRequestAccepted": string;
         "pollEnded": string;
-        "newNote": string;
         "unreadAntennaNote": string;
         "emptyPushNotificationMessage": string;
         "achievementEarned": string;
@@ -2179,7 +2151,6 @@ export interface Locale {
         "notificationWillBeDisplayedLikeThis": string;
         "_types": {
             "all": string;
-            "note": string;
             "follow": string;
             "mention": string;
             "reply": string;
@@ -2259,47 +2230,6 @@ export interface Locale {
             "mention": string;
         };
     };
-    "_moderationLogTypes": {
-        "createRole": string;
-        "deleteRole": string;
-        "updateRole": string;
-        "assignRole": string;
-        "unassignRole": string;
-        "suspend": string;
-        "unsuspend": string;
-        "addCustomEmoji": string;
-        "updateCustomEmoji": string;
-        "deleteCustomEmoji": string;
-        "updateServerSettings": string;
-        "updateUserNote": string;
-        "deleteDriveFile": string;
-        "deleteNote": string;
-        "createGlobalAnnouncement": string;
-        "createUserAnnouncement": string;
-        "updateGlobalAnnouncement": string;
-        "updateUserAnnouncement": string;
-        "deleteGlobalAnnouncement": string;
-        "deleteUserAnnouncement": string;
-        "resetPassword": string;
-        "suspendRemoteInstance": string;
-        "unsuspendRemoteInstance": string;
-        "markSensitiveDriveFile": string;
-        "unmarkSensitiveDriveFile": string;
-        "resolveAbuseReport": string;
-        "createInvitation": string;
-        "createAd": string;
-        "deleteAd": string;
-        "updateAd": string;
-    };
-    "_fileViewer": {
-        "title": string;
-        "type": string;
-        "size": string;
-        "url": string;
-        "uploadedAt": string;
-        "attachedNotes": string;
-        "thisPageCanBeSeenFromTheAuthor": string;
-    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/it-IT.yml

@@ -64,7 +64,7 @@ reply: "Rispondi"
 loadMore: "Mostra di più"
 showMore: "Espandi"
 showLess: "Comprimi"
-youGotNewFollower: "Adesso ti segue"
+youGotNewFollower: "Ti sta seguendo"
 receiveFollowRequest: "Hai ricevuto una richiesta di follow"
 followRequestAccepted: "Ha accettato la tua richiesta di follow"
 mention: "Menzioni"
@@ -78,7 +78,7 @@ download: "Scarica"
 driveFileDeleteConfirm: "Vuoi davvero eliminare il file \"{name}\", e le Note a cui è stato allegato?"
 unfollowConfirm: "Vuoi davvero smettere di seguire {name}?"
 exportRequested: "Hai richiesto un'esportazione, e potrebbe volerci tempo. Quando sarà compiuta, il file verrà aggiunto direttamente al Drive."
-importRequested: "Hai richiesto un'importazione. Potrebbe richiedere un po' di tempo."
+importRequested: "Hai richiesto un'importazione. Può volerci tempo. "
 lists: "Liste"
 noLists: "Nessuna lista"
 note: "Nota"
@@ -106,18 +106,18 @@ unfollow: "Non seguire"
 followRequestPending: "Richiesta in approvazione"
 enterEmoji: "Inserisci emoji"
 renote: "Rinota"
-unrenote: "Elimina la Rinota"
+unrenote: "Annulla rinota"
 renoted: "Rinotato!"
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
 quote: "Cita"
 inChannelRenote: "Rinota nel canale"
 inChannelQuote: "Cita nel canale"
-pinnedNote: "Nota in primo piano"
+pinnedNote: "Nota fissata"
 pinned: "Fissa sul profilo"
 you: "Tu"
 clickToShow: "Clicca per visualizzare"
-sensitive: "Esplicito"
+sensitive: "Contenuto sensibile"
 add: "Aggiungi"
 reaction: "Reazioni"
 reactions: "Reazioni"
@@ -125,16 +125,16 @@ reactionSetting: "Reazioni visualizzate sul pannello"
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
 attachCancel: "Rimuovi allegato"
-markAsSensitive: "Segna come esplicito"
-unmarkAsSensitive: "Non segnare come esplicito "
+markAsSensitive: "Segna come sensibile"
+unmarkAsSensitive: "Segna come non sensibile"
 enterFileName: "Nome del file"
 mute: "Silenzia"
 unmute: "Riattiva l'audio"
-renoteMute: "Silenzia le Rinota"
-renoteUnmute: "Non silenziare le Rinota"
+renoteMute: "Silenzia i Rinota"
+renoteUnmute: "Non silenziare i Rinota"
 block: "Blocca"
 unblock: "Sblocca"
-suspend: "Sospensione"
+suspend: "Sospendi"
 unsuspend: "Revoca la sospensione"
 blockConfirm: "Vuoi davvero bloccare il profilo?"
 unblockConfirm: "Vuoi davvero sbloccare il profilo?"
@@ -148,7 +148,7 @@ editAntenna: "Modifica Antenna"
 selectWidget: "Seleziona il riquadro"
 editWidgets: "Modifica i riquadri"
 editWidgetsExit: "Conferma le modifiche"
-customEmojis: "Emoji personalizzate"
+customEmojis: "Emoji personalizzati"
 emoji: "Emoji"
 emojis: "Emoji"
 emojiName: "Nome dell'emoji"
@@ -158,8 +158,8 @@ 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: "Copia nella cache locale i file espliciti remoti"
-cacheRemoteSensitiveFilesDescription: "Disattivando questa opzione, i file espliciti verranno richiesti direttamente all'istanza remota senza essere salvati nel server locale."
+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"
 flagAsBotDescription: "Attiva questo campo se il profilo esegue principalmente operazioni automatiche. L'attivazione segnala agli altri sviluppatori come comportarsi per evitare catene d’interazione infinite con altri bot. I sistemi interni di Misskey si adegueranno al fine di trattare questo profilo come bot."
 flagAsCat: "Sono un gatto"
@@ -180,13 +180,13 @@ youHaveNoLists: "Non hai ancora creato nessuna lista"
 followConfirm: "Vuoi seguire {name}?"
 proxyAccount: "Profilo proxy"
 proxyAccountDescription: "Un profilo proxy funziona come follower per i profili remoti, sotto certe condizioni. Ad esempio, quando un profilo locale ne inserisce uno remoto in una lista (senza seguirlo), se nessun altro segue quel profilo remoto, le attività non possono essere distribuite. Dunque, il profilo proxy le seguirà per tutti."
-host: "Host"
+host: "Server remoto"
 selectUser: "Seleziona profilo"
 recipient: "Destinatario"
 annotation: "Annotazione preventiva"
 federation: "Federazione"
 instances: "Istanza"
-registeredAt: "Prima federazione"
+registeredAt: "Registrato presso"
 latestRequestReceivedAt: "Ultima richiesta ricevuta"
 latestStatus: "Ultimo stato"
 storageUsage: "Capienza dei dischi"
@@ -287,7 +287,7 @@ images: "Immagini"
 image: "Immagini"
 birthday: "Compleanno"
 yearsOld: "{age} anni"
-registeredDate: "Data iscrizione"
+registeredDate: "Iscrizione a.."
 location: "Posizione"
 theme: "Tema"
 themeForLightMode: "Tema da utilizzare per il modo chiaro"
@@ -321,7 +321,7 @@ copyUrl: "Copia URL"
 rename: "Modifica nome"
 avatar: "Foto del profilo"
 banner: "Intestazione"
-displayOfSensitiveMedia: "Visibilità dei media espliciti"
+displayOfSensitiveMedia: "Visibilità dei media sensibili"
 whenServerDisconnected: "Quando la connessione col server è persa"
 disconnectedFromServer: "Il server si è disconnesso"
 reload: "Ricarica"
@@ -336,7 +336,7 @@ instanceName: "Nome dell'istanza"
 instanceDescription: "Descrizione dell'istanza"
 maintainerName: "Nome dell'amministratore"
 maintainerEmail: "Indirizzo e-mail dell'amministratore"
-tosUrl: "URL delle condizioni d'uso"
+tosUrl: "URL dei termini del servizio e della privacy"
 thisYear: "Anno"
 thisMonth: "Mese"
 today: "Oggi"
@@ -356,6 +356,7 @@ 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"
@@ -364,7 +365,7 @@ pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagi
 pinnedPages: "Pagine in evidenza"
 pinnedPagesDescription: "Specifica il percorso delle pagine che vuoi fissare in cima alla pagina dell'istanza. Una pagina per riga."
 pinnedClipId: "ID della Clip in evidenza"
-pinnedNotes: "Note in primo piano"
+pinnedNotes: "Nota fissata"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Abilita hCaptcha"
 hcaptchaSiteKey: "Chiave del sito"
@@ -384,7 +385,7 @@ name: "Nome"
 antennaSource: "Fonte dell'antenna"
 antennaKeywords: "Parole chiavi da ricevere"
 antennaExcludeKeywords: "Parole chiavi da escludere"
-antennaKeywordsDescription: "Sparando con uno spazio indichi la condizione E (and). Separando con un a capo, indichi la condizione O (or)."
+antennaKeywordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con un'interruzzione riga indica la condizione \"O\"."
 notifyAntenna: "Invia notifiche delle nuove note"
 withFileAntenna: "Solo note con file in allegato"
 enableServiceworker: "Abilita ServiceWorker"
@@ -393,7 +394,7 @@ caseSensitive: "Sensibile alla distinzione tra maiuscole e minuscole"
 withReplies: "Includere le risposte"
 connectedTo: "Connessione ai seguenti profili:"
 notesAndReplies: "Note e risposte"
-withFiles: "Con allegati"
+withFiles: "Con file in allegato"
 silence: "Silenzia"
 silenceConfirm: "Vuoi davvero silenziare questo profilo?"
 unsilence: "Riattiva"
@@ -418,7 +419,6 @@ moderator: "Moderatore"
 moderation: "moderazione"
 moderationNote: "Promemoria di moderazione"
 addModerationNote: "Aggiungi promemoria di moderazione"
-moderationLogs: "Cronologia di moderazione"
 nUsersMentioned: "{n} profili menzionati"
 securityKeyAndPasskey: "Chiave di sicurezza e accesso"
 securityKey: "Chiave di sicurezza"
@@ -461,7 +461,7 @@ invitationCode: "Codice di invito"
 checking: "Confermando"
 available: "Disponibile"
 unavailable: "Il nome utente è già in uso"
-usernameInvalidFormat: "Il nome utente deve avere solo caratteri alfanumerici e trattino basso '_'"
+usernameInvalidFormat: "Il nome utente può contenere solo lettere, numeri e '_'"
 tooShort: "Troppo breve"
 tooLong: "Troppo lungo"
 weakPassword: "Password debole"
@@ -497,7 +497,7 @@ noFollowRequests: "Non hai alcuna richiesta di follow"
 openImageInNewTab: "Apri le immagini in un nuovo tab"
 dashboard: "Pannello di controllo"
 local: "Locale"
-remote: "Remota"
+remote: "Remoto"
 total: "Totale"
 weekOverWeekChanges: "Settimanale"
 dayOverDayChanges: "Giornaliero"
@@ -552,8 +552,8 @@ installedDate: "Data installazione"
 lastUsedDate: "Data di ultimo uso"
 state: "Stato"
 sort: "Ordina per"
-ascendingOrder: "Aumenta"
-descendingOrder: "Diminuisce"
+ascendingOrder: "Ascendente"
+descendingOrder: "Discendente"
 scratchpad: "ScratchPad"
 scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Misskey."
 output: "Uscita"
@@ -622,7 +622,7 @@ emailConfigInfo: "Utilizzato per verificare il tuo indirizzo di posta elettronic
 email: "Email"
 emailAddress: "Indirizzo di posta elettronica"
 smtpConfig: "Impostazioni del server SMTP"
-smtpHost: "Host SMTP"
+smtpHost: "Server remoto"
 smtpPort: "Porta"
 smtpUser: "Nome utente"
 smtpPass: "Password"
@@ -708,10 +708,9 @@ driveUsage: "Utilizzazione del Drive"
 noCrawle: "Rifiuta l'indicizzazione dai robot."
 noCrawleDescription: "Richiedi che i motori di ricerca non indicizzino la tua pagina di profilo, le tue note, pagine, ecc."
 lockedAccountInfo: "A meno che non imposti la visibilità delle tue note su \"Solo ai follower\", le tue note sono visibili da tutti, anche se hai configurato l'account per confermare manualmente le richieste di follow."
-alwaysMarkSensitive: "Segnare gli allegati come espliciti come opzione predefinita"
+alwaysMarkSensitive: "Segnare i media come sensibili per impostazione predefinita"
 loadRawImages: "Visualizza le intere immagini allegate invece delle miniature."
 disableShowingAnimatedImages: "Disabilita le immagini animate"
-highlightSensitiveMedia: "Evidenzia i media espliciti"
 verificationEmailSent: "Una mail di verifica è stata inviata. Si prega di accedere al collegamento per compiere la verifica."
 notSet: "Non impostato"
 emailVerified: "Il tuo indirizzo email è stato verificato"
@@ -928,7 +927,7 @@ type: "Tipo"
 speed: "Velocità"
 slow: "Lento"
 fast: "Veloce"
-sensitiveMediaDetection: "Rilevamento dei contenuti espliciti"
+sensitiveMediaDetection: "Rilevamento dei contenuti sensibili."
 localOnly: "Soltanto locale"
 remoteOnly: "Solo remoto"
 failedToUpload: "errore di caricamento"
@@ -991,7 +990,7 @@ thisPostMayBeAnnoying: "Questa nota potrebbe essere offensiva"
 thisPostMayBeAnnoyingHome: "Pubblica sulla timeline principale"
 thisPostMayBeAnnoyingCancel: "Annulla"
 thisPostMayBeAnnoyingIgnore: "Pubblica lo stesso"
-collapseRenotes: "Comprimi le Rinota già viste"
+collapseRenotes: "Comprimi i Rinota già letti"
 internalServerError: "Errore interno del server"
 internalServerErrorDescription: "Si è verificato un errore imprevisto all'interno del server"
 copyErrorInfo: "Copia le informazioni sull'errore"
@@ -1008,11 +1007,11 @@ cannotBeChangedLater: "Non sarà più modificabile"
 reactionAcceptance: "Reazioni consentite"
 likeOnly: "Solo i Like"
 likeOnlyForRemote: "Solo Like remoti"
-nonSensitiveOnly: "Soltanto non espliciti"
-nonSensitiveOnlyForLocalLikeOnlyForRemote: "Soltanto non espliciti (reazioni remote)"
+nonSensitiveOnly: "Solamente non sensibili"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "Solamente non sensibili (solo Mi piace remoti)"
 rolesAssignedToMe: "I miei ruoli"
 resetPasswordConfirm: "Vuoi davvero ripristinare la password?"
-sensitiveWords: "Parole esplicite"
+sensitiveWords: "Parole sensibili"
 sensitiveWordsDescription: "Imposta automaticamente \"Home\" alla visibilità delle Note che contengono una qualsiasi parola tra queste configurate. Puoi separarle per riga."
 sensitiveWordsDescription2: "Gli spazi creano la relazione \"E\" tra parole (questo E quello). Racchiudere una parola nelle slash \"/\" la trasforma in Espressione Regolare."
 notesSearchNotAvailable: "Non è possibile cercare tra le Note."
@@ -1109,32 +1108,6 @@ 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"
-keepScreenOn: "Mantieni lo schermo acceso"
-verifiedLink: "Abbiamo confermato la validità di questo collegamento"
-notifyNotes: "Notifica nuove Note"
-unnotifyNotes: "Interrompi le notifiche di nuove Note"
-authentication: "Autenticazione"
-authenticationRequiredToContinue: "Per procedere, è richiesta l'autenticazione"
-dateAndTime: "Data e Ora"
-showRenotes: "Includi le Rinota"
-edited: "Modificato"
-notificationRecieveConfig: "Preferenze di notifica"
-mutualFollow: "Follow reciproco"
-fileAttachedOnly: "Solo con allegati"
-showRepliesToOthersInTimeline: "Risposte altrui nella TL"
-hideRepliesToOthersInTimeline: "Nascondi Riposte altrui nella TL"
-externalServices: "Servizi esterni"
-impressum: "Dichiarazione di proprietà"
-impressumUrl: "URL della dichiarazione di proprietà"
-impressumDescription: "La dichiarazione di proprietà, è obbligatoria in alcuni paesi come la Germania (Impressum)."
-privacyPolicy: "Informativa sulla privacy"
-privacyPolicyUrl: "URL della informativa privacy"
-tosAndPrivacyPolicy: "Condizioni d'uso e informativa sulla privacy"
 _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."
@@ -1161,15 +1134,6 @@ _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"
-  shortName: "Abbreviazione"
-  shortNameDescription: "Un'abbreviazione o un nome comune che può essere visualizzato al posto del nome ufficiale lungo del server."
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
   moveFromSub: "Crea un alias verso un altro profilo remoto"
@@ -1464,14 +1428,14 @@ _role:
   _options:
     gtlAvailable: "Disponibilità della Timeline Federata"
     ltlAvailable: "Disponibilità della Timeline Locale"
-    canPublicNote: "Scrivere Note con Visibilità Pubblica"
-    canInvite: "Generare codici di invito all'istanza"
+    canPublicNote: "Può scrivere Note con Visibilità Pubblica"
+    canInvite: "Genera codici di invito all'istanza"
     inviteLimit: "Limite di codici invito"
     inviteLimitCycle: "Intervallo di emissione del codice di invito"
     inviteExpirationTime: "Scadenza del codice di invito"
     canManageCustomEmojis: "Gestire le emoji personalizzate"
     driveCapacity: "Capienza del Drive"
-    alwaysMarkNsfw: "Impostare sempre come esplicito (NSFW)"
+    alwaysMarkNsfw: "Imposta sempre come NSFW"
     pinMax: "Quantità massima di Note in primo piano"
     antennaMax: "Quantità massima di Antenne"
     wordMuteMax: "Lunghezza massima del filtro parole"
@@ -1482,16 +1446,15 @@ _role:
     userEachUserListsMax: "Quantità massima di profili per lista"
     rateLimitFactor: "Limite del rapporto"
     descriptionOfRateLimitFactor: "I rapporti più bassi sono meno restrittivi, quelli più alti lo sono di più."
-    canHideAds: "Nascondere i banner"
+    canHideAds: "Può nascondere i banner"
     canSearchNotes: "Ricercare nelle Note"
-    canUseTranslator: "Tradurre le Note"
   _condition:
     isLocal: "Profilo locale"
     isRemote: "Profilo remoto"
-    createdLessThan: "Profilo creato da meno di N"
-    createdMoreThan: "Profilo creato da più di N"
-    followersLessThanOrEq: "Profilo con N follower o meno"
-    followersMoreThanOrEq: "Profilo con N follower o più"
+    createdLessThan: "Creato meno di"
+    createdMoreThan: "Creato più di"
+    followersLessThanOrEq: "Ha meno di N follower"
+    followersMoreThanOrEq: "Ha più di N follower"
     followingLessThanOrEq: "Segue N profili o meno"
     followingMoreThanOrEq: "Segue N profili o più"
     notesLessThanOrEq: "Conteggio Note inferiore o uguale a"
@@ -1500,9 +1463,9 @@ _role:
     or: "O"
     not: "NON"
 _sensitiveMediaDetection:
-  description: "Utilizzare l'apprendimento automatico (machine learning) per riconoscere media espliciti e sottoporli alla moderazione. Aumenterà lievemente il carico del server."
-  sensitivity: "Sensibilità del rilevamento"
-  sensitivityDescription: "Abbassando la sensibilità si riducono i falsi positivi (rilevazioni errate). Aumentando la sensibilità si riduce il numero di rilevazioni mancate. (rilevazioni ignorate)."
+  description: "L'apprendimento automatico può essere utilizzato per individuare automaticamente i media sensibili da moderare. Il carico del server aumenta leggermente."
+  sensitivity: "Sensibilità di rilevamento"
+  sensitivityDescription: "Una minore sensibilità riduce i falsi positivi (false positività). Una maggiore sensibilità riduce le omissioni (falsi negativi)."
   setSensitiveFlagAutomatically: "Impostare il flag NSFW."
   setSensitiveFlagAutomaticallyDescription: "Anche se questa impostazione è disattivata, il risultato della decisione viene conservato internamente."
   analyzeVideos: "Abilitazione dell'analisi video."
@@ -1533,10 +1496,6 @@ _ad:
   reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
   hide: "Nascondi"
   timezoneinfo: "Il giorno della settimana è determinato in base al fuso orario del server."
-  adsSettings: "Impostazioni banner"
-  notesPerOneAd: "Quantità di Note tra i banner"
-  setZeroToDisable: "Imposta 0 (zero) per disattivare la distribuzione dei banner durante gli aggiornamenti in tempo reale"
-  adsTooClose: "Attenzione, l'intervallo di pubblicazione dei banner è molto breve, potrebbe infastidire significativamente la fruizione"
 _forgotPassword:
   enterEmail: "Inserisci l'indirizzo di posta elettronica che hai registrato nel tuo profilo. Il collegamento necessario per ripristinare la password verrà inviato a questo indirizzo."
   ifNoEmail: "Se il tuo indirizzo email non risulta registrato, contatta l'amministrazione dell'istanza."
@@ -1548,14 +1507,13 @@ _gallery:
   unlike: "Non mi piace più"
 _email:
   _follow:
-    title: "Adesso ti segue"
+    title: "Ha iniziato a seguirti"
   _receiveFollowRequest:
     title: "Hai ricevuto una richiesta di follow"
 _plugin:
   install: "Installa estensioni"
   installWarn: "Si prega di installare soltanto estensioni che provengono da fonti affidabili."
   manage: "Gestisci estensioni"
-  viewSource: "Visualizza sorgente"
 _preferencesBackups:
   list: "Elenco di impostazioni salvate in precedenza"
   saveNew: "Nuovo salvataggio"
@@ -1590,8 +1548,8 @@ _aboutMisskey:
   morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
   patrons: "Sostenitori"
 _displayOfSensitiveMedia:
-  respect: "Nascondere i media espliciti"
-  ignore: "Non nascondere i media espliciti"
+  respect: "Nascondere i media sensibili"
+  ignore: "Non nascondere i media sensibili"
   force: "Nascondi tutti i media"
 _instanceTicker:
   none: "Nascondi"
@@ -1620,8 +1578,13 @@ _menuDisplay:
   hide: "Nascondere"
 _wordMute:
   muteWords: "Parole da filtrare"
-  muteWordsDescription: "Sparando con uno spazio indichi la condizione E (and). Separando con un a capo, indichi la condizione O (or)."
+  muteWordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con una interruzione di riga, indica la condizione \"O\""
   muteWordsDescription2: "Se vuoi indicare delle Espressioni Regolari (regexp), metti la condizione all'interno di due slash (/)"
+  softDescription: "Verranno nascoste da tutte le Timeline quelle Note che soddisfano le seguenti condizioni"
+  hardDescription: "Impedisci alla istanza di caricare Note che soddisfano le seguenti condizioni. Le Note già filtrate sono già scomparse in modo irreversibile, fino al cambiamento delle condizioni. Dopo di che scompariranno quelle che soddisfano le nuove condizioni."
+  soft: "Leggero"
+  hard: "Pesante"
+  mutedNotes: "Note filtrate"
 _instanceMute:
   instanceMuteDescription: "Disattiva tutte le note, le note di rinvio (condivisione) dell'istanza configurata, comprese le risposte agli utenti dell'istanza."
   instanceMuteDescription2: "Impostazione separata da una nuova riga"
@@ -1630,7 +1593,7 @@ _instanceMute:
 _theme:
   explore: "Esplora temi"
   install: "Installa un tema"
-  manage: "Gestione temi"
+  manage: "Gerisci temi"
   code: "Codice tema"
   description: "Descrizione"
   installed: "{name} è installato"
@@ -1685,6 +1648,9 @@ _theme:
     infoFg: "Testo di informazioni"
     infoWarnBg: "Sfondo degli avvisi"
     infoWarnFg: "Testo di avviso"
+    cwBg: "Sfondo del CW"
+    cwFg: "Testo del pulsante CW"
+    cwHoverBg: "Sfondo del pulsante CW (sorvolato)"
     toastBg: "Sfondo di notifica a comparsa"
     toastFg: "Testo di notifica a comparsa"
     buttonBg: "Sfondo del pulsante"
@@ -1702,6 +1668,8 @@ _sfx:
   note: "Nota"
   noteMy: "Mia nota"
   notification: "Notifiche"
+  chat: "Messaggi"
+  chatBg: "Chat (sfondo)"
   antenna: "Ricezione dell'antenna"
   channel: "Notifiche di canale"
 _ago:
@@ -1733,6 +1701,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "La configurazione è stata già completata."
   registerTOTP: "Registra un'app di autenticazione"
+  passwordToTOTP: "Inserire la password"
   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."
@@ -1811,7 +1780,6 @@ _antennaSources:
   homeTimeline: "Note dagli utenti che segui"
   users: "Note dagli utenti selezionati"
   userList: "Note dagli utenti della lista selezionata"
-  userBlacklist: "Tutte le Note tranne quelle di uno o più profili specificati"
 _weekday:
   sunday: "Domenica"
   monday: "Lunedì"
@@ -1886,7 +1854,7 @@ _visibility:
   followersDescription: "Visibile solo ai tuoi follower"
   specified: "Nota diretta"
   specifiedDescription: "Visibile solo ai profili menzionati"
-  disableFederation: "Senza federazione"
+  disableFederation: "Non federare"
   disableFederationDescription: "Non spedire attività alle altre istanze remote"
 _postForm:
   replyPlaceholder: "Rispondi a questa nota..."
@@ -1911,7 +1879,6 @@ _profile:
   metadataContent: "Contenuto"
   changeAvatar: "Modifica immagine profilo"
   changeBanner: "Cambia intestazione"
-  verifiedLinkDescription: "Puoi verificare il tuo profilo mostrando una icona. Devi inserire la URL alla pagina che contiene un link al tuo profilo."
 _exportOrImport:
   allNotes: "Tutte le note"
   favoritedNotes: "Note preferite"
@@ -2026,11 +1993,10 @@ _notification:
   youGotReply: "{name} ti ha risposto"
   youGotQuote: "{name} ha citato la tua Nota e ha detto"
   youRenoted: "{name} ha rinotato"
-  youWereFollowed: "Adesso ti segue"
+  youWereFollowed: "Ha iniziato a seguirti"
   youReceivedFollowRequest: "Hai ricevuto una richiesta di follow"
   yourFollowRequestAccepted: "La tua richiesta di follow è stata accettata"
   pollEnded: "Risultati del sondaggio."
-  newNote: "Nuove Note"
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Le notifiche push sono state aggiornate."
   achievementEarned: "Obiettivo raggiunto"
@@ -2040,8 +2006,7 @@ _notification:
   notificationWillBeDisplayedLikeThis: "La notifica apparirà così"
   _types:
     all: "Tutto"
-    note: "Nuove Note"
-    follow: "Nuovi profili follower"
+    follow: "Novità follower"
     mention: "Menzioni"
     reply: "Risposte"
     renote: "Rinota"
@@ -2110,34 +2075,3 @@ _webhookSettings:
     renote: "Quando la Nota è Rinotata"
     reaction: "Quando ricevo una reazione"
     mention: "Quando mi menzionano"
-_moderationLogTypes:
-  createRole: "Ruolo creato"
-  deleteRole: "Ruolo eliminato"
-  updateRole: "Ruolo aggiornato"
-  assignRole: "Ruolo assegnato"
-  unassignRole: "Ruolo disassegnato"
-  suspend: "Sospensione"
-  unsuspend: "Sospensione rimossa"
-  addCustomEmoji: "Emoji personalizzata aggiunta"
-  updateCustomEmoji: "Emoji personalizzata aggiornata"
-  deleteCustomEmoji: "Emoji personalizzata eliminata"
-  updateServerSettings: "Impostazioni del server aggiornate"
-  updateUserNote: "Promemoria di moderazione aggiornato"
-  deleteDriveFile: "File da Drive eliminato"
-  deleteNote: "Nota eliminata"
-  createGlobalAnnouncement: "Annuncio globale creato"
-  createUserAnnouncement: "Annuncio ai profili iscritti creato"
-  updateGlobalAnnouncement: "Annuncio globale aggiornato"
-  updateUserAnnouncement: "Annuncio ai profili iscritti aggiornato"
-  deleteGlobalAnnouncement: "Annuncio globale eliminato"
-  deleteUserAnnouncement: "Annuncio ai profili iscritti eliminato"
-  resetPassword: "Password azzerata"
-  suspendRemoteInstance: "Istanza remota sospesa"
-  unsuspendRemoteInstance: "Istanza remota riattivata"
-  markSensitiveDriveFile: "File nel Drive segnato come esplicito"
-  unmarkSensitiveDriveFile: "File nel Drive segnato come non esplicito"
-  resolveAbuseReport: "Segnalazione risolta"
-  createInvitation: "Genera codice di invito"
-  createAd: "Banner creato"
-  deleteAd: "Banner eliminato"
-  updateAd: "Banner aggiornato"

locales/ja-JP.yml

@@ -15,7 +15,7 @@ gotIt: "わかった"
 cancel: "キャンセル"
 noThankYou: "やめておく"
 enterUsername: "ユーザー名を入力"
-renotedBy: "{user}がリノート"
+renotedBy: "{user}がRenote"
 noNotes: "ノートはありません"
 noNotifications: "通知はありません"
 instance: "サーバー"
@@ -45,10 +45,10 @@ pin: "ピン留め"
 unpin: "ピン留め解除"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
-copyLinkRenote: "リノートのリンクをコピー"
+copyLinkRenote: "Renoteのリンクをコピー"
 delete: "削除"
 deleteAndEdit: "削除して編集"
-deleteAndEditConfirm: "このノートを削除してもう一度編集しますか？このノートへのリアクション、リノート、返信も全て削除されます。"
+deleteAndEditConfirm: "このノートを削除してもう一度編集しますか？このノートへのリアクション、Renote、返信も全て削除されます。"
 addToList: "リストに追加"
 addToAntenna: "アンテナに追加"
 sendMessage: "メッセージを送信"
@@ -105,13 +105,13 @@ followRequests: "フォロー申請"
 unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
-renote: "リノート"
-unrenote: "リノート解除"
-renoted: "リノートしました。"
-cantRenote: "この投稿はリノートできません。"
-cantReRenote: "リノートをリノートすることはできません。"
+renote: "Renote"
+unrenote: "Renote解除"
+renoted: "Renoteしました。"
+cantRenote: "この投稿はRenoteできません。"
+cantReRenote: "RenoteをRenoteすることはできません。"
 quote: "引用"
-inChannelRenote: "チャンネル内リノート"
+inChannelRenote: "チャンネル内Renote"
 inChannelQuote: "チャンネル内引用"
 pinnedNote: "ピン留めされたノート"
 pinned: "ピン留め"
@@ -418,7 +418,6 @@ moderator: "モデレーター"
 moderation: "モデレーション"
 moderationNote: "モデレーションノート"
 addModerationNote: "モデレーションノートを追加する"
-moderationLogs: "モデログ"
 nUsersMentioned: "{n}人が投稿"
 securityKeyAndPasskey: "セキュリティキー・パスキー"
 securityKey: "セキュリティキー"
@@ -658,7 +657,7 @@ behavior: "動作"
 sample: "サンプル"
 abuseReports: "通報"
 reportAbuse: "通報"
-reportAbuseRenote: "リノートを通報"
+reportAbuseRenote: "Renoteを通報"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
@@ -692,9 +691,9 @@ manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
 notesCount: "ノートの数"
 repliesCount: "返信した数"
-renotesCount: "リノートした数"
+renotesCount: "Renoteした数"
 repliedCount: "返信された数"
-renotedCount: "リノートされた数"
+renotedCount: "Renoteされた数"
 followingCount: "フォロー数"
 followersCount: "フォロワー数"
 sentReactionsCount: "リアクションした数"
@@ -711,7 +710,6 @@ lockedAccountInfo: "フォローを承認制にしても、ノートの公開範
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
-highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
 notSet: "未設定"
 emailVerified: "メールアドレスが確認されました"
@@ -991,7 +989,7 @@ thisPostMayBeAnnoying: "この投稿は迷惑になる可能性があります
 thisPostMayBeAnnoyingHome: "ホームに投稿"
 thisPostMayBeAnnoyingCancel: "やめる"
 thisPostMayBeAnnoyingIgnore: "このまま投稿"
-collapseRenotes: "見たことのあるリノートを省略して表示"
+collapseRenotes: "見たことのあるRenoteを省略して表示"
 internalServerError: "サーバー内部エラー"
 internalServerErrorDescription: "サーバー内部で予期しないエラーが発生しました。"
 copyErrorInfo: "エラー情報をコピー"
@@ -1039,7 +1037,7 @@ forceShowAds: "常に広告を表示する"
 addMemo: "メモを追加"
 editMemo: "メモを編集"
 reactionsList: "リアクション一覧"
-renotesList: "リノート一覧"
+renotesList: "Renote一覧"
 notificationDisplay: "通知の表示"
 leftTop: "左上"
 rightTop: "右上"
@@ -1109,32 +1107,6 @@ currentAnnouncements: "現在のお知らせ"
 pastAnnouncements: "過去のお知らせ"
 youHaveUnreadAnnouncements: "未読のお知らせがあります。"
 useSecurityKey: "ブラウザまたはデバイスの指示に従って、セキュリティキーまたはパスキーを使用してください。"
-replies: "返信"
-renotes: "リノート"
-loadReplies: "返信を見る"
-loadConversation: "会話を見る"
-pinnedList: "ピン留めされたリスト"
-keepScreenOn: "デバイスの画面を常にオンにする"
-verifiedLink: "このリンク先の所有者であることが確認されました"
-notifyNotes: "投稿を通知"
-unnotifyNotes: "投稿の通知を解除"
-authentication: "認証"
-authenticationRequiredToContinue: "続けるには認証を行ってください"
-dateAndTime: "日時"
-showRenotes: "リノートを表示"
-edited: "編集済み"
-notificationRecieveConfig: "通知の受信設定"
-mutualFollow: "相互フォロー"
-fileAttachedOnly: "ファイル付きのみ"
-showRepliesToOthersInTimeline: "TLに他の人への返信を含める"
-hideRepliesToOthersInTimeline: "TLに他の人への返信を含めない"
-externalServices: "外部サービス"
-impressum: "運営者情報"
-impressumUrl: "運営者情報URL"
-impressumDescription: "ドイツなどの一部の国と地域では表示が義務付けられています(Impressum)。"
-privacyPolicy: "プライバシーポリシー"
-privacyPolicyUrl: "プライバシーポリシーURL"
-tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"
@@ -1169,11 +1141,9 @@ _serverSettings:
   iconUrl: "アイコン画像のURL"
   appIconDescription: "{host}がアプリとして表示される際のアイコンを指定します。"
   appIconUsageExample: "例: PWAや、スマートフォンのホーム画面にブックマークとして追加された時など"
-  appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるため、塗り潰された余白のある背景を持つことが推奨されます。"
+  appIconStyleRecommendation: "画像は透過部分が無く、塗りつぶされた余白がある背景を持つことが推奨されます。"
   appIconResolutionMustBe: "解像度は必ず{resolution}である必要があります。"
   manifestJsonOverride: "manifest.jsonのオーバーライド"
-  shortName: "略称"
-  shortNameDescription: "サーバーの正式名称が長い場合に、代わりに表示することのできる略称や通称。"
 
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに移行"
@@ -1490,8 +1460,7 @@ _role:
     rateLimitFactor: "レートリミット"
     descriptionOfRateLimitFactor: "小さいほど制限が緩和され、大きいほど制限が強化されます。"
     canHideAds: "広告の非表示"
-    canSearchNotes: "ノート検索の利用"
-    canUseTranslator: "翻訳機能の利用"
+    canSearchNotes: "ノート検索の利用可否"
   _condition:
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
@@ -1546,10 +1515,6 @@ _ad:
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"
   hide: "表示しない"
   timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されます。"
-  adsSettings: "広告配信設定"
-  notesPerOneAd: "リアルタイム更新中に広告を配信する間隔（ノートの個数）"
-  setZeroToDisable: "0でリアルタイム更新時の広告配信を無効"
-  adsTooClose: "広告の配信間隔が極めて短いため、ユーザー体験が著しく損われる可能性があります。"
 
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
@@ -1572,7 +1537,6 @@ _plugin:
   install: "プラグインのインストール"
   installWarn: "信頼できないプラグインはインストールしないでください。"
   manage: "プラグインの管理"
-  viewSource: "ソースを表示"
 
 _preferencesBackups:
   list: "作成したバックアップ"
@@ -1648,6 +1612,11 @@ _wordMute:
   muteWords: "ミュートするワード"
   muteWordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。"
   muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現になります。"
+  softDescription: "指定した条件のノートをタイムラインから隠します。"
+  hardDescription: "指定した条件のノートをタイムラインに追加しないようにします。追加されなかったノートは、条件を変更しても除外されたままになります。"
+  soft: "ソフト"
+  hard: "ハード"
+  mutedNotes: "ミュートされたノート"
 
 _instanceMute:
   instanceMuteDescription: "ミュートしたサーバーのユーザーへの返信を含めて、設定したサーバーの全てのノートとRenoteをミュートします。"
@@ -1714,6 +1683,9 @@ _theme:
     infoFg: "情報の文字"
     infoWarnBg: "警告の背景"
     infoWarnFg: "警告の文字"
+    cwBg: "CW ボタンの背景"
+    cwFg: "CW ボタンの文字"
+    cwHoverBg: "CW ボタンの背景 (ホバー)"
     toastBg: "通知トーストの背景"
     toastFg: "通知トーストの文字"
     buttonBg: "ボタンの背景"
@@ -1732,6 +1704,8 @@ _sfx:
   note: "ノート"
   noteMy: "ノート(自分)"
   notification: "通知"
+  chat: "チャット"
+  chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
 
@@ -1767,6 +1741,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"
   registerTOTP: "認証アプリの設定を開始"
+  passwordToTOTP: "パスワードを入力してください"
   step1: "まず、{a}や{b}などの認証アプリをお使いのデバイスにインストールします。"
   step2: "次に、表示されているQRコードをアプリでスキャンします。"
   step2Click: "QRコードをクリックすると、お使いの端末にインストールされている認証アプリやキーリングに登録できます。"
@@ -1848,7 +1823,6 @@ _antennaSources:
   homeTimeline: "フォローしているユーザーのノート"
   users: "指定した一人または複数のユーザーのノート"
   userList: "指定したリストのユーザーのノート"
-  userBlacklist: "指定した一人または複数のユーザーを除いた全てのノート"
 
 _weekday:
   sunday: "日曜日"
@@ -1955,7 +1929,6 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アイコン画像を変更"
   changeBanner: "バナー画像を変更"
-  verifiedLinkDescription: "内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。"
 
 _exportOrImport:
   allNotes: "全てのノート"
@@ -2083,7 +2056,6 @@ _notification:
   youReceivedFollowRequest: "フォローリクエストが来ました"
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
   pollEnded: "アンケートの結果が出ました"
-  newNote: "新しい投稿"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
   achievementEarned: "実績を獲得"
@@ -2094,7 +2066,6 @@ _notification:
 
   _types:
     all: "すべて"
-    note: "ユーザーの新規投稿"
     follow: "フォロー"
     mention: "メンション"
     reply: "リプライ"
@@ -2171,44 +2142,3 @@ _webhookSettings:
     renote: "Renoteされたとき"
     reaction: "リアクションがあったとき"
     mention: "メンションされたとき"
-
-_moderationLogTypes:
-  createRole: "ロールを作成"
-  deleteRole: "ロールを削除"
-  updateRole: "ロールを更新"
-  assignRole: "ロールへアサイン"
-  unassignRole: "ロールのアサイン解除"
-  suspend: "凍結"
-  unsuspend: "凍結解除"
-  addCustomEmoji: "カスタム絵文字追加"
-  updateCustomEmoji: "カスタム絵文字更新"
-  deleteCustomEmoji: "カスタム絵文字削除"
-  updateServerSettings: "サーバー設定更新"
-  updateUserNote: "モデレーションノート更新"
-  deleteDriveFile: "ファイルを削除"
-  deleteNote: "ノートを削除"
-  createGlobalAnnouncement: "全体のお知らせを作成"
-  createUserAnnouncement: "ユーザーへお知らせを作成"
-  updateGlobalAnnouncement: "全体のお知らせを更新"
-  updateUserAnnouncement: "ユーザーのお知らせを更新"
-  deleteGlobalAnnouncement: "全体のお知らせを削除"
-  deleteUserAnnouncement: "ユーザーのお知らせを削除"
-  resetPassword: "パスワードをリセット"
-  suspendRemoteInstance: "リモートサーバーを停止"
-  unsuspendRemoteInstance: "リモートサーバーを再開"
-  markSensitiveDriveFile: "ファイルをセンシティブ付与"
-  unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
-  resolveAbuseReport: "通報を解決"
-  createInvitation: "招待コードを作成"
-  createAd: "広告を作成"
-  deleteAd: "広告を削除"
-  updateAd: "広告を更新"
-
-_fileViewer:
-  title: "ファイルの詳細"
-  type: "ファイルタイプ"
-  size: "ファイルサイズ"
-  url: "URL"
-  uploadedAt: "追加日"
-  attachedNotes: "添付されているノート"
-  thisPageCanBeSeenFromTheAuthor: "このページは、このファイルをアップロードしたユーザーしか閲覧できません。"

locales/ja-KS.yml

@@ -355,6 +355,7 @@ invite: "来てや"
 driveCapacityPerLocalAccount: "ローカルユーザーはんひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーはんひとりあたりのドライブ容量"
 inMb: "メガバイト単位"
+iconUrl: "アイコン画像のURL"
 bannerUrl: "バナー画像のURL"
 backgroundImageUrl: "背景画像のURL"
 basicInfo: "基本情報"
@@ -1102,13 +1103,6 @@ forYou: "あんたへ"
 currentAnnouncements: "現在のお知らせやで"
 pastAnnouncements: "過去のお知らせやで"
 youHaveUnreadAnnouncements: "あんたまだこのお知らせ読んどらんやろ。"
-useSecurityKey: "ブラウザまたはデバイスの言う通りに、セキュリティキーまたはパスキーを使ってや。"
-replies: "返事"
-renotes: "Renote"
-loadReplies: "返信を見るで"
-loadConversation: "会話を見るで"
-verifiedLink: "このリンク先の所有者であることが確認されたで。"
-authenticationRequiredToContinue: "続けるには認証をやってや。"
 _announcement:
   forExistingUsers: "もうおるユーザーのみ"
   forExistingUsersDescription: "有効にすると、このお知らせ作成時点でおるユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。"
@@ -1135,13 +1129,6 @@ _initialAccountSetting:
   laterAreYouSure: "初期設定あとでやり直すん？"
 _serverRules:
   description: "新規登録前に見せる、サーバーの簡潔なルールを設定すんで。内容は使うための決め事の要約とすることを推奨するわ。"
-_serverSettings:
-  iconUrl: "アイコン画像のURL"
-  appIconDescription: "{host}がアプリとして表示してるんやつをアイコンを指定すんで。"
-  appIconUsageExample: "PWAや、スマートフォンのホーム画面にブックマークとして追加された時など"
-  appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるさかいに、塗り潰された余白のある背景があるものが推奨されるで。"
-  appIconResolutionMustBe: "解像度は必ず{resolution}である必要があるで。"
-  shortNameDescription: "サーバーの名前が長い時に、代わりに表示することのできるあだ名。"
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
   moveFromSub: "別のアカウントへエイリアスを作る"
@@ -1519,7 +1506,6 @@ _plugin:
   install: "プラグインのインストール"
   installWarn: "信頼できへんプラグインはインストールせんとってな"
   manage: "プラグインの管理"
-  viewSource: "ソースを表示"
 _preferencesBackups:
   list: "作ったバックアップ"
   saveNew: "新しく保存"
@@ -1586,6 +1572,11 @@ _wordMute:
   muteWords: "ミュートするワード"
   muteWordsDescription: "スペースで区切るとAND指定になって、改行で区切るとOR指定になるで。"
   muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現になるで。"
+  softDescription: "指定した条件のノートをタイムラインから隠すで。"
+  hardDescription: "指定した条件のノートをタイムラインに追加しないようにするで。追加せーへんかったかったノートは、条件を変えても除外されたままになるで。"
+  soft: "ソフト"
+  hard: "ハード"
+  mutedNotes: "ミュートされたノート"
 _instanceMute:
   instanceMuteDescription: "ミュートしたサーバーのユーザーへの返信を含めて、設定したインスタンスの全てのノートとRenoteをミュートにするで。"
   instanceMuteDescription2: "改行で区切って設定するんやで"
@@ -1649,6 +1640,9 @@ _theme:
     infoFg: "情報の文字"
     infoWarnBg: "警告の背景"
     infoWarnFg: "警告の文字"
+    cwBg: "CW ボタンの背景"
+    cwFg: "CW ボタンの文字"
+    cwHoverBg: "CW ボタンの背景 (ホバー)"
     toastBg: "通知トーストの背景"
     toastFg: "通知トーストの文字"
     buttonBg: "ボタンの背景"
@@ -1666,6 +1660,8 @@ _sfx:
   note: "ノート"
   noteMy: "ノート(自分)"
   notification: "通知"
+  chat: "チャット"
+  chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
 _ago:
@@ -1697,12 +1693,12 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "もう設定終わっとるわ。"
   registerTOTP: "認証アプリの設定はじめる"
+  passwordToTOTP: "パスワードを入れてーや"
   step1: "ほんなら、{a}や{b}とかの認証アプリを使っとるデバイスにインストールしてな。"
   step2: "次に、ここにあるQRコードをアプリでスキャンしてな～。"
   step2Click: "QRコードをクリックすると、今使とる端末に入っとる認証アプリとかキーリングに登録できるで。"
   step3Title: "確認コードを入れてーや"
   step3: "アプリに表示されているトークンを入力して終わりや。"
-  setupCompleted: "設定が完了したで。"
   step4: "これからログインするときも、同じようにトークンを入力するんやで"
   securityKeyNotSupported: "今使とるブラウザはセキュリティキーに対応してへんのやってさ。"
   registerTOTPBeforeKey: "セキュリティキー・パスキーを登録するんやったら、まず認証アプリを設定してーな。"
@@ -1717,10 +1713,6 @@ _2fa:
   renewTOTPConfirm: "今までの認証アプリの確認コードは使えんくなるけどええか？"
   renewTOTPOk: "もっかい設定する"
   renewTOTPCancel: "やめとく"
-  checkBackupCodesBeforeCloseThisWizard: "このウィザードを閉じる前に、したのバックアップコードを確認しいや。"
-  backupCodesDescription: "認証アプリが使用できんなった場合、以下のバックアップコードを使ってアカウントにアクセスできるで。これらのコードは必ず安全な場所に置いときや。各コードは一回だけ使用できるで。"
-  backupCodeUsedWarning: "バックアップコードが使用されたで。認証アプリが使えなくなってるん場合、なるべく早く認証アプリを再設定しや。"
-  backupCodesExhaustedWarning: "バックアップコードが全て使用されたで。認証アプリを利用できん場合、これ以上アカウントにアクセスできなくなるで。認証アプリを再登録しや。"
 _permissions:
   "read:account": "アカウントの情報を見るで"
   "write:account": "アカウントの情報を変更するで"
@@ -1993,9 +1985,6 @@ _notification:
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしといたで"
   achievementEarned: "実績を獲得しとるで"
-  checkNotificationBehavior: "通知の表示を確かめるで"
-  sendTestNotification: "テスト通知を送信するで"
-  notificationWillBeDisplayedLikeThis: "通知はこのように表示されるで"
   _types:
     all: "すべて"
     follow: "フォロー"
@@ -2031,7 +2020,6 @@ _deck:
   introduction2: "画面の右にある + を押して、いつでもカラムを追加できるで。"
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選んでウィジェットを追加してなー"
   useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
-  usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となるで"
   _columns:
     main: "メイン"
     widgets: "ウィジェット"
@@ -2066,7 +2054,3 @@ _webhookSettings:
     renote: "Renoteされるとき～！"
     reaction: "ツッコミがあるとき～！"
     mention: "メンションがあるとき～！"
-_moderationLogTypes:
-  suspend: "凍結"
-  resetPassword: "パスワードをリセット"
-  createInvitation: "招待コードを作成"

locales/kab-KAB.yml

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

locales/ko-KR.yml

@@ -356,6 +356,7 @@ invite: "초대"
 driveCapacityPerLocalAccount: "로컬 유저 한 명당 드라이브 용량"
 driveCapacityPerRemoteAccount: "리모트 유저 한 명당 드라이브 용량"
 inMb: "메가바이트 단위"
+iconUrl: "아이콘 URL"
 bannerUrl: "배너 이미지 URL"
 backgroundImageUrl: "배경 이미지 URL"
 basicInfo: "기본 정보"
@@ -416,9 +417,6 @@ totp: "인증 앱"
 totpDescription: "인증 앱을 사용하여 일회성 비밀번호 입력"
 moderator: "모더레이터"
 moderation: "모더레이션"
-moderationNote: "모더레이션 노트"
-addModerationNote: "모더레이션 노트 추가하기"
-moderationLogs: "모더레이션 로그"
 nUsersMentioned: "{n}명이 언급함"
 securityKeyAndPasskey: "보안 키 또는 패스 키"
 securityKey: "보안 키"
@@ -1108,20 +1106,6 @@ currentAnnouncements: "현재 공지사항"
 pastAnnouncements: "과거 공지사항"
 youHaveUnreadAnnouncements: "읽지 않은 공지사항이 있습니다."
 useSecurityKey: "브라우저 또는 기기의 안내에 따라 보안 키 또는 패스키를 사용해 주십시오."
-replies: "답글"
-renotes: "리노트"
-loadReplies: "답글 보기"
-loadConversation: "대화 보기"
-pinnedList: "고정해놓은 리스트"
-keepScreenOn: "기기 화면을 항상 켜기"
-verifiedLink: "이 링크의 소유자임이 확인되었습니다."
-notifyNotes: "새 노트 알림 켜기"
-unnotifyNotes: "새 노트 알림 끄기"
-authentication: "인증"
-showRenotes: "리노트 표시"
-edited: "수정됨"
-notificationRecieveConfig: "알림 설정"
-mutualFollow: "맞팔로우"
 _announcement:
   forExistingUsers: "기존 유저에게만 알림"
   forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다."
@@ -1148,14 +1132,6 @@ _initialAccountSetting:
   laterAreYouSure: "초기 설정을 나중에 진행하시겠습니까?"
 _serverRules:
   description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다."
-_serverSettings:
-  iconUrl: "아이콘 URL"
-  appIconUsageExample: "예를 들어, PWA나 스마트폰 홈 화면에 북마크로 추가되었을 때 등"
-  appIconStyleRecommendation: "아이콘이 원형 또는 둥근 사각형으로 잘리는 경우가 있으므로, 가장자리 여백이 충분한 사진을 사용하는 것을 추천합니다."
-  appIconResolutionMustBe: "해상도는 반드시 {resolution} 이어야 합니다."
-  manifestJsonOverride: "manifest.json 오버라이드"
-  shortName: "약칭"
-  shortNameDescription: "서버의 정식 명칭이 긴 경우에, 대신에 표시할 수 있는 약칭이나 통칭."
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1533,7 +1509,6 @@ _plugin:
   install: "플러그인 설치"
   installWarn: "신뢰할 수 없는 플러그인은 설치하지 않는 것이 좋습니다."
   manage: "플러그인 관리"
-  viewSource: "소스 보기"
 _preferencesBackups:
   list: "생성한 백업"
   saveNew: "새 백업 만들기"
@@ -1600,6 +1575,11 @@ _wordMute:
   muteWords: "뮤트할 단어"
   muteWordsDescription: "공백으로 구분하는 경우 AND, 줄바꿈으로 구분하는 경우 OR로 지정됩니다."
   muteWordsDescription2: "정규 표현식을 사용하려면 키워드를 빗금표(/)로 감싸 주세요."
+  softDescription: "지정한 조건의 노트를 타임라인에서 숨깁니다."
+  hardDescription: "지정한 조건의 노트를 타임라인에 추가하지 않습니다. 타임라인에 추가되지 않은 노트는 조건을 변경해도 표시되지 않습니다."
+  soft: "보통"
+  hard: "보다 높은 수준"
+  mutedNotes: "뮤트된 노트"
 _instanceMute:
   instanceMuteDescription: "뮤트한 서버에서 오는 답글을 포함한 모든 노트와 Renote를 뮤트합니다."
   instanceMuteDescription2: "한 줄에 하나씩 입력해 주세요"
@@ -1663,6 +1643,9 @@ _theme:
     infoFg: "정보창 텍스트"
     infoWarnBg: "경고창 배경"
     infoWarnFg: "경고창 텍스트"
+    cwBg: "CW 버튼 배경"
+    cwFg: "CW 버튼 텍스트"
+    cwHoverBg: "CW 버튼 배경 (호버)"
     toastBg: "알림창 배경"
     toastFg: "알림창 텍스트"
     buttonBg: "버튼 배경"
@@ -1680,6 +1663,8 @@ _sfx:
   note: "새 노트"
   noteMy: "내 노트"
   notification: "알림"
+  chat: "대화"
+  chatBg: "대화 (백그라운드)"
   antenna: "안테나 수신"
   channel: "채널 알림"
 _ago:
@@ -1711,6 +1696,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
   registerTOTP: "인증 앱 설정 시작"
+  passwordToTOTP: "비밀번호를 입력하세요."
   step1: "먼저, {a}나 {b}등의 인증 앱을 사용 중인 디바이스에 설치합니다."
   step2: "그 후, 표시되어 있는 QR코드를 앱으로 스캔합니다."
   step2Click: "QR 코드를 클릭하면 기기에 설치된 인증 앱에 등록할 수 있습니다."
@@ -2084,7 +2070,3 @@ _webhookSettings:
     renote: "누군가 내 글을 Renote했을 때"
     reaction: "누군가 내 노트에 리액션했을 때"
     mention: "누군가 나를 멘션했을 때"
-_moderationLogTypes:
-  suspend: "정지"
-  resetPassword: "비밀번호 재설정"
-  createInvitation: "초대 코드 생성"

locales/lo-LA.yml

@@ -391,8 +391,6 @@ administration: "ການຈັດການ"
 middle: "ປານກາງ"
 searchByGoogle: "ຄົ້ນຫາ"
 file: "ໄຟລ໌"
-replies: "ຕອບ​ໄປ​ທີ"
-renotes: "Renote"
 _role:
   _priority:
     middle: "ປານກາງ"
@@ -407,6 +405,7 @@ _theme:
 _sfx:
   note: "ບັນທຶກ"
   notification: "ການແຈ້ງເຕືອນ"
+  chat: "ແຊ໋ດ"
 _2fa:
   renewTOTPCancel: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້"
 _widgets:
@@ -462,5 +461,3 @@ _deck:
     mentions: "ກ່າວເຖິງ"
 _webhookSettings:
   name: "ຊື່"
-_moderationLogTypes:
-  suspend: "ລະງັບ"

locales/nl-NL.yml

@@ -338,6 +338,7 @@ 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,8 +427,6 @@ windowMaximize: "Maximaliseren"
 windowRestore: "Herstellen"
 loggedInAsBot: "Momenteel als bot ingelogd"
 icon: "Avatar"
-replies: "Antwoord"
-renotes: "Herdelen"
 _email:
   _follow:
     title: "volgde jou"
@@ -438,6 +437,7 @@ _theme:
 _sfx:
   note: "Notities"
   notification: "Meldingen"
+  chat: "Chat"
 _2fa:
   renewTOTPCancel: "Nee, bedankt"
 _widgets:
@@ -493,6 +493,3 @@ _deck:
     mentions: "Vermeldingen"
 _webhookSettings:
   name: "Naam"
-_moderationLogTypes:
-  suspend: "Opschorten"
-  resetPassword: "Wachtwoord terugzetten"

locales/no-NO.yml

@@ -462,8 +462,6 @@ continue: "Fortsett"
 youFollowing: "Følger"
 options: "Alternativ"
 icon: "Avatar"
-replies: "Svar"
-renotes: "Renote"
 _initialAccountSetting:
   theseSettingsCanEditLater: "Du kan endre disse innstillingene senere."
 _achievements:
@@ -575,6 +573,9 @@ _channel:
   nameAndDescription: "Navn og beskrivelse"
 _menuDisplay:
   hide: "Skjul"
+_wordMute:
+  soft: "Myk"
+  hard: "Hard"
 _theme:
   description: "Beskrivelse"
   color: "Farge"
@@ -722,5 +723,3 @@ _deck:
     direct: "Direkte"
 _webhookSettings:
   name: "Navn"
-_moderationLogTypes:
-  suspend: "Suspender"

locales/pl-PL.yml

@@ -333,6 +333,7 @@ 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"
@@ -871,8 +872,6 @@ show: "Wyświetlanie"
 color: "Kolor"
 youFollowing: "Śledzeni"
 icon: "Awatar"
-replies: "Odpowiedz"
-renotes: "Udostępnij"
 _role:
   priority: "Priorytet"
   _priority:
@@ -925,7 +924,6 @@ _plugin:
   install: "Zainstaluj wtyczki"
   installWarn: "Nie instaluj niezaufanych wtyczek."
   manage: "Zarządzanie wtyczkami"
-  viewSource: "Zobacz źródło"
 _preferencesBackups:
   list: "Utworzone kopie zapasowe"
   saveNew: "Zapisz nową kopię zapasową"
@@ -982,6 +980,9 @@ _menuDisplay:
 _wordMute:
   muteWords: "Słowo do wyciszenia"
   muteWordsDescription2: "Otocz słowa kluczowe ukośnikami, aby używać wyrażeń regularnych."
+  soft: "Łagodny"
+  hard: "Twardy"
+  mutedNotes: "Wyciszone wpisy"
 _instanceMute:
   title: "Ukrywa wpisy z wymienionych instancji."
   heading: "Lista instancji do wyciszenia"
@@ -1043,6 +1044,9 @@ _theme:
     infoFg: "Tekst informacji"
     infoWarnBg: "Tło ostrzeżenia"
     infoWarnFg: "Tekst ostrzeżenia"
+    cwBg: "Tło CW"
+    cwFg: "Tekst CW"
+    cwHoverBg: "Tło CW (po najechaniu)"
     toastBg: "Tło powiadomień"
     toastFg: "Tekst powiadomień"
     buttonBg: "Tło przycisku"
@@ -1060,6 +1064,8 @@ _sfx:
   note: "Wpisy"
   noteMy: "Mój wpis"
   notification: "Powiadomienia"
+  chat: "Wiadomości"
+  chatBg: "Rozmowy (tło)"
   antenna: "Anteny"
   channel: "Powiadomienia kanału"
 _ago:
@@ -1394,6 +1400,3 @@ _webhookSettings:
     renote: "Po udostępnieniu wpisu"
     reaction: "Po otrzymaniu reakcji"
     mention: "Po zostaniu wspomnianym"
-_moderationLogTypes:
-  suspend: "Zawieś"
-  resetPassword: "Zresetuj hasło"

locales/pt-PT.yml

@@ -356,6 +356,7 @@ 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"
@@ -411,7 +412,6 @@ aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Símbolo"
 2fa: "Autenticação de dois fatores"
-setupOf2fa: "Configuração de autenticação de dois fatores"
 totp: "Aplicativo Autenticador"
 totpDescription: "Digite a senha de uso único informado pelo aplicativo autenticador"
 moderator: "Moderador"
@@ -919,7 +919,6 @@ pleaseSelect: "Por favor, selecione."
 reverse: "Inversão"
 colored: "Colorido"
 refreshInterval: "Intervalo de atualização"
-label: "Etiqueta"
 type: "Tipo"
 speed: "Velocidade"
 slow: "Lento"
@@ -1008,13 +1007,8 @@ rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Se nenhum cargo for espe
 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Estes cargos devem ser públicos."
 waitingForMailAuth: "Verificação de e-mail pendente "
 icon: "Avatar"
-replies: "Responder"
-renotes: "Repostar"
-keepScreenOn: "Manter a tela do dispositivo sempre ligada"
 _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.)"
@@ -1320,6 +1314,7 @@ _theme:
 _sfx:
   note: "Posts"
   notification: "Notificações"
+  chat: "Chat"
 _ago:
   invalid: "Não há nada aqui"
 _timelineTutorial:
@@ -1496,6 +1491,3 @@ _webhookSettings:
     follow: "Quando seguindo um usuário"
     followed: "Quando sendo seguido"
     renote: "Quando repostado"
-_moderationLogTypes:
-  suspend: "Suspender"
-  resetPassword: "Redefinir senha"

locales/ro-RO.yml

@@ -328,6 +328,7 @@ 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,8 +631,6 @@ searchByGoogle: "Caută"
 file: "Fișiere"
 show: "Arată"
 icon: "Avatar"
-replies: "Răspunde"
-renotes: "Re-notează"
 _role:
   _priority:
     middle: "Mediu"
@@ -647,6 +646,7 @@ _theme:
 _sfx:
   note: "Note"
   notification: "Notificări"
+  chat: "Chat"
 _ago:
   invalid: "Nu e nimic de văzut aici"
 _widgets:
@@ -703,6 +703,3 @@ _deck:
     mentions: "Mențiuni"
 _webhookSettings:
   name: "Nume"
-_moderationLogTypes:
-  suspend: "Suspendă"
-  resetPassword: "Resetează parola"

locales/ru-RU.yml

@@ -354,6 +354,7 @@ invite: "Пригласить"
 driveCapacityPerLocalAccount: "Объём диска на одного локального пользователя"
 driveCapacityPerRemoteAccount: "Объём диска на одного пользователя с другого сайта"
 inMb: "В мегабайтах"
+iconUrl: "Ссылка на аватар"
 bannerUrl: "Ссылка на изображение в шапке"
 backgroundImageUrl: "Ссылка на фоновое изображение"
 basicInfo: "Общая информация"
@@ -1065,8 +1066,6 @@ unused: "Неиспользуемый"
 expired: "Срок действия приглашения истёк"
 doYouAgree: "Согласны?"
 icon: "Аватар"
-replies: "Ответить"
-renotes: "Репост"
 _initialAccountSetting:
   accountCreated: "Аккаунт успешно создан!"
   letsStartAccountSetup: "Давайте настроим вашу учётную запись."
@@ -1074,8 +1073,6 @@ _initialAccountSetting:
   privacySetting: "Настройки конфиденциальности"
   initialAccountSettingCompleted: "Первоначальная настройка успешно завершена!"
   skipAreYouSure: "Пропустить настройку?"
-_serverSettings:
-  iconUrl: "Адрес на иконку роли"
 _achievements:
   earnedAt: "Разблокировано в"
   _types:
@@ -1427,7 +1424,6 @@ _plugin:
   install: "Установка расширений"
   installWarn: "Пожалуйста, не устанавливайте расширения, которым не доверяете."
   manage: "Управление расширениями"
-  viewSource: "Просмотр исходника"
 _preferencesBackups:
   list: "Существующие резервные копии"
   saveNew: "Создать резервную копию"
@@ -1488,6 +1484,11 @@ _wordMute:
   muteWords: "Скрыть слово"
   muteWordsDescription: "Пишите слова через пробел в одной строке, чтобы фильтровать их появление вместе; а если хотите фильтровать любое из них, пишите в отдельных строках."
   muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите их между двумя дробными чертами (/)."
+  softDescription: "Соответствующие условиям заметки будут спрятаны из вашей ленты."
+  hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не появятся."
+  soft: "Мягко"
+  hard: "Жёстко"
+  mutedNotes: "Скрытые заметки"
 _instanceMute:
   instanceMuteDescription: "Заметки и репосты с указанных здесь инстансов, а также ответы пользователям оттуда же не будут отображаться."
   instanceMuteDescription2: "Пишите каждый инстанс на отдельной строке"
@@ -1551,6 +1552,9 @@ _theme:
     infoFg: "Текст сообщения"
     infoWarnBg: "Фон предупреждения"
     infoWarnFg: "Текст предупреждения"
+    cwBg: "Фон предупреждения о содержимом"
+    cwFg: "Текст предупреждения о содержимом"
+    cwHoverBg: "Фон предупреждения о содержимом (под указателем)"
     toastBg: "Фон оповещения"
     toastFg: "Текст оповещения"
     buttonBg: "Фон кнопки"
@@ -1568,6 +1572,8 @@ _sfx:
   note: "Заметки"
   noteMy: "Собственные заметки"
   notification: "Уведомления"
+  chat: "Сообщения"
+  chatBg: "Сообщения (фон)"
   antenna: "Антенна"
   channel: "Канал"
 _ago:
@@ -1599,6 +1605,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
   registerTOTP: "Начните настраивать приложение-аутентификатор"
+  passwordToTOTP: "Пожалуйста, введите свой пароль"
   step1: "Прежде всего, установите на устройство приложение для аутентификации, например, {a} или {b}."
   step2: "Далее отсканируйте отображаемый QR-код при помощи приложения."
   step2Click: "Нажав на QR-код, вы можете зарегистрироваться с помощью приложения для аутентификации или брелка для ключей, установленного на вашем устройстве."
@@ -1941,6 +1948,3 @@ _webhookSettings:
   createWebhook: "Создать вебхук"
   name: "Название"
   active: "Вкл."
-_moderationLogTypes:
-  suspend: "Заморозить"
-  resetPassword: "Сброс пароля:"

locales/sk-SK.yml

@@ -337,6 +337,7 @@ 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"
@@ -919,8 +920,6 @@ color: "Farba"
 horizontal: "Strana"
 youFollowing: "Sledované"
 icon: "Avatar"
-replies: "Odpovedať"
-renotes: "Preposlať"
 _role:
   priority: "Priorita"
   _priority:
@@ -978,7 +977,6 @@ _plugin:
   install: "Inštalova pluginy"
   installWarn: "Prosím neinštalujte nedôveryhodné pluginy."
   manage: "Spravovanie pluginov"
-  viewSource: "Ukázať zdroj"
 _preferencesBackups:
   list: "Vytvorené zálohy"
   saveNew: "Uložiť novú"
@@ -1039,6 +1037,11 @@ _wordMute:
   muteWords: "Umlčané slová"
   muteWordsDescription: "Medzerami oddeľte pre podmienku AND a novými riadkami pre podmienku OR."
   muteWordsDescription2: "Regulárne výrazy sa použijú keď použijete okolo lomítka."
+  softDescription: "Skryje poznámky z časovej osi, ktoré spĺňajú podmienky."
+  hardDescription: "Zabráni poznámky spĺňajúce množinu podmienok, aby boli pridané do časovej osi. Navyše tieto poznámky nepribudnú v časovej osi ani keď sa podmienky zmenia."
+  soft: "Mäkké"
+  hard: "Tvrdé"
+  mutedNotes: "Umlčané poznámky"
 _instanceMute:
   instanceMuteDescription: "Toto umlčí všetky poznámky/preposlania zo zoznamu serverov, vrátane tých, na ktoré používatelia odpovedajú z umlčaného servera."
   instanceMuteDescription2: "Oddeľte novými riadkami"
@@ -1102,6 +1105,9 @@ _theme:
     infoFg: "Informačný text"
     infoWarnBg: "Pozadie varovania"
     infoWarnFg: "Text varovania"
+    cwBg: "CW pozadie tlačidla"
+    cwFg: "CW text tlačidla"
+    cwHoverBg: "CW pozadie tlačidla (pod kurzorom)"
     toastBg: "Pozadie upozornenia"
     toastFg: "Text upozornenia"
     buttonBg: "Pozadie tlačidla"
@@ -1119,6 +1125,8 @@ _sfx:
   note: "Poznámky"
   noteMy: "Vlastná poznámka"
   notification: "Oznámenia"
+  chat: "Chat"
+  chatBg: "Chat (pozadie)"
   antenna: "Antény"
   channel: "Upozornenia kanála"
 _ago:
@@ -1441,6 +1449,3 @@ _deck:
 _webhookSettings:
   name: "Názov"
   active: "Zapnuté"
-_moderationLogTypes:
-  suspend: "Zmraziť"
-  resetPassword: "Resetovať heslo"

locales/sv-SE.yml

@@ -337,6 +337,7 @@ 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,8 +486,6 @@ pleaseDonate: "Misskey är en gratis programvara som används på {host}. Donera
 resetPasswordConfirm: "Återställ verkligen ditt lösenord?"
 dataSaver: "Databesparing"
 icon: "Profilbild"
-replies: "Svara"
-renotes: "Omnotera"
 _achievements:
   _types:
     _open3windows:
@@ -507,8 +506,10 @@ _theme:
 _sfx:
   note: "Noter"
   notification: "Notifikationer"
+  chat: "Chatt"
   antenna: "Antenner"
 _2fa:
+  passwordToTOTP: "Skriv in ditt lösenord"
   renewTOTPCancel: "Nej tack"
 _antennaSources:
   all: "Alla noter"
@@ -572,6 +573,3 @@ _deck:
 _webhookSettings:
   name: "Namn"
   active: "Aktiverad"
-_moderationLogTypes:
-  suspend: "Suspendera"
-  resetPassword: "Återställ Lösenord"

locales/th-TH.yml

@@ -356,6 +356,7 @@ invite: "เชิญชวน"
 driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ภายในเครื่อง"
 driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"
 inMb: "เป็นเมกะไบต์"
+iconUrl: "ไอคอน URL"
 bannerUrl: "URL รูปภาพแบนเนอร์"
 backgroundImageUrl: "URL ภาพพื้นหลัง"
 basicInfo: "ข้อมูลเบื้องต้น"
@@ -416,9 +417,6 @@ totp: "แอป Authenticator"
 totpDescription: "ใช้แอปยืนยันตัวตนเพื่อป้อนรหัสผ่านแบบใช้ครั้งเดียว"
 moderator: "ผู้ควบคุม"
 moderation: "การกลั่นกรอง"
-moderationNote: "โน้ตการกลั่นกรอง"
-addModerationNote: "เพิ่มโน้ตการกลั่นกรอง"
-moderationLogs: "บันทึกการกลั่นกรอง"
 nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} รายนี้"
 securityKeyAndPasskey: "ความปลอดภัยและรหัสผ่าน"
 securityKey: "กุญแจความปลอดภัย"
@@ -711,7 +709,6 @@ lockedAccountInfo: "เว้นแต่ว่าคุณจะต้องต
 alwaysMarkSensitive: "ทำเครื่องหมายเป็น NSFW เป็นค่าเริ่มต้น"
 loadRawImages: "โหลดภาพต้นฉบับแทนการแสดงภาพขนาดย่อ"
 disableShowingAnimatedImages: "ไม่ต้องเล่นภาพเคลื่อนไหว"
-highlightSensitiveMedia: "ไฮไลท์สื่อที่ละเอียดอ่อน"
 verificationEmailSent: "ส่งอีเมลยืนยันแล้วนะ ได้โปรดกรุณาไปที่ลิงก์ที่รวมไว้เพื่อทำการตรวจสอบให้เสร็จสิ้น"
 notSet: "ไม่ได้ตั้งค่า"
 emailVerified: "อีเมลได้รับการยืนยันแล้ว"
@@ -1026,7 +1023,6 @@ retryAllQueuesConfirmText: "สิ่งนี้จะเพิ่มการ
 enableChartsForRemoteUser: "สร้างแผนภูมิข้อมูลผู้ใช้ระยะไกล"
 enableChartsForFederatedInstances: "สร้างแผนภูมิข้อมูลอินสแตนซ์ระยะไกล"
 showClipButtonInNoteFooter: "เพิ่ม \"คลิป\" เพื่อบันทึกเมนูการทำงาน"
-reactionsDisplaySize: "รีแอคชั่นแสดงผลขนาด"
 noteIdOrUrl: "โน้ต ID หรือ URL"
 video: "วีดีโอ"
 videos: "วีดีโอ"
@@ -1105,26 +1101,7 @@ iHaveReadXCarefullyAndAgree: "ฉันได้อ่านข้อควา
 dialog: "ไดอะล็อก"
 icon: "ไอคอน"
 forYou: "สำหรับคุณ"
-currentAnnouncements: "ประกาศในปัจจุบัน"
-pastAnnouncements: "ประกาศที่ผ่านมา"
-youHaveUnreadAnnouncements: "มีการประกาศที่ยังไม่ได้อ่าน"
-replies: "ตอบกลับ"
-renotes: "รีโน้ต"
-loadReplies: "แสดงการตอบกลับ"
-loadConversation: "แสดงบทสนทนา"
-pinnedList: "รายการที่ปักหมุดไว้แล้ว"
-keepScreenOn: "เปิดหน้าจอไว้"
-notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต์ใหม่"
-unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
-authentication: "การตรวจสอบสิทธิ์"
-dateAndTime: "เวลาประทับ"
-showRenotes: "แสดงรีโน้ต"
-edited: "แก้ไขแล้ว"
-notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
-mutualFollow: "ติดตามซึ่งกันและกัน"
-fileAttachedOnly: "เฉพาะโน้ตที่มีไฟล์เท่านั้น"
 _announcement:
-  forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
   forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
   needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
   end: "ประกาศเก็บถาวร"
@@ -1148,10 +1125,6 @@ _initialAccountSetting:
   laterAreYouSure: "ต้องการตั้งค่าโปรไฟล์ในภายหลังจริงๆอย่างงั้นหรอ?"
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
-_serverSettings:
-  iconUrl: "ไอคอน URL"
-  manifestJsonOverride: "manifest.json โอเวอร์ลาย"
-  shortName: "ชื่อย่อ"
 _accountMigration:
   moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
@@ -1406,9 +1379,6 @@ _achievements:
       title: "Brain Diver"
       description: "โพสต์ลิงก์ไปยัง Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
-    _smashTestNotificationButton:
-      title: "ทดสอบโอเวอร์โฟลว์"
-      description: "ทดสอบการแจ้งเตือนทริกเกอร์ซ้ำๆ ภายในระยะเวลาอันสั้นๆ"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
@@ -1466,7 +1436,6 @@ _role:
     descriptionOfRateLimitFactor: "ขีดจํากัดอัตราที่ต่ำกว่ามีข้อจํากัดน้อยกว่าข้อจํากัดที่สูงกว่า"
     canHideAds: "ซ่อนโฆษณา"
     canSearchNotes: "การใช้การค้นหาโน้ต"
-    canUseTranslator: "การใช้งานแปล"
   _condition:
     isLocal: "ผู้ใช้ภายใน"
     isRemote: "ผู้ใช้ระยะไกล"
@@ -1533,7 +1502,6 @@ _plugin:
   install: "ติดตั้งปลั๊กอิน"
   installWarn: "กรุณาอย่าติดตั้งปลั๊กอินที่ไม่น่าเชื่อถือนะคะ"
   manage: "จัดการปลั๊กอิน"
-  viewSource: "ดูต้นฉบับ"
 _preferencesBackups:
   list: "สร้างการสำรองข้อมูล"
   saveNew: "บันทึกใหม่"
@@ -1600,6 +1568,11 @@ _wordMute:
   muteWords: "ปิดเสียงคำ"
   muteWordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
   muteWordsDescription2: "ล้อมรอบคีย์เวิร์ดด้วยเครื่องหมายทับเพื่อใช้นิพจน์ทั่วไป"
+  softDescription: "ซ่อนโน้ตให้ตรงตามเงื่อนไขที่ตั้งไว้จากไทม์ไลน์"
+  hardDescription: "ป้องกันไม่ให้โน้ตย่อที่ตรงตามเงื่อนไขที่ตั้งไว้ไม่ให้ถูกเพิ่มลงในไทม์ไลน์ นอกจากนี้ โน้ตเหล่านี้จะไม่ถูกเพิ่มลงในไทม์ไลน์แม้ว่าจะมีการเปลี่ยนแปลงเงื่อนไขยังไงก็ตาม"
+  soft: "ซอฟ"
+  hard: "ยาก"
+  mutedNotes: "ปิดเสียงโน้ต"
 _instanceMute:
   instanceMuteDescription: "การดำเนินการนี้จะปิดเสียง\"โน้ต/รีโน้ต\"จากอินสแตนซ์ที่อยู่ในรายการ รวมถึงบันทึกของผู้ใช้ที่ตอบกลับผู้ใช้จากอินสแตนซ์ที่ปิดเสียง"
   instanceMuteDescription2: "คั่นด้วยการขึ้นบรรทัดใหม่"
@@ -1663,6 +1636,9 @@ _theme:
     infoFg: "ข้อความข้อมูล"
     infoWarnBg: "คำเตือนพื้นหลัง"
     infoWarnFg: "คำเตือนข้อความ"
+    cwBg: "ปุ่ม CW พื้นหลัง"
+    cwFg: "ปุ่ม CW ข้อความ"
+    cwHoverBg: "ปุ่ม CW พื้นหลัง (โฮเวอร์)"
     toastBg: "ประวัติการแจ้งเตือน"
     toastFg: "ข้อความแจ้งเตือน"
     buttonBg: "ปุ่มพื้นหลัง"
@@ -1680,6 +1656,8 @@ _sfx:
   note: "หมายเหตุ"
   noteMy: "โน้ตของตัวเอง"
   notification: "การเเจ้งเตือน"
+  chat: "แชท"
+  chatBg: "แชท (พื้นหลัง)"
   antenna: "เสาอากาศ"
   channel: "การแจ้งเตือนช่อง"
 _ago:
@@ -1711,6 +1689,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "คุณได้ลงทะเบียนอุปกรณ์ยืนยันตัวตนแบบ 2 ชั้นแล้ว"
   registerTOTP: "ลงทะเบียนแอพตัวตรวจสอบสิทธิ์"
+  passwordToTOTP: "กรอกรหัสผ่าน"
   step1: "ขั้นตอนแรก ติดตั้งแอปยืนยันตัวตน (เช่น {a} หรือ {b}) บนอุปกรณ์ของคุณ"
   step2: "จากนั้นสแกนรหัส QR ที่แสดงบนหน้าจอนี้"
   step2Click: "การคลิกที่รหัส QR นี้จะช่วยให้คุณนั้นสามารถลงทะเบียน 2FA กับคีย์ความปลอดภัยหรือแอปตรวจสอบความถูกต้องของโทรศัพท์ได้"
@@ -1784,7 +1763,6 @@ _antennaSources:
   homeTimeline: "โน้ตจากผู้ใช้ที่ติดตาม"
   users: "โน้ตจากผู้ใช้ที่เฉพาะเจาะจง"
   userList: "โน้ตจากรายชื่อผู้ใช้ที่ระบุ"
-  userBlacklist: "โน้ตทั้งหมดยกเว้นโน้ตของผู้ใช้ที่ต้องระบุเจาะจงตั้งแต่หนึ่งรายขึ้นไป"
 _weekday:
   sunday: "วันอาทิตย์"
   monday: "วันจันทร์"
@@ -1884,7 +1862,6 @@ _profile:
   metadataContent: "เนื้อหา"
   changeAvatar: "เปลี่ยนอวาตาร์"
   changeBanner: "เปลี่ยนแบนเนอร์"
-  verifiedLinkDescription: "โดยการป้อน URL ที่มีลิงก์ไปยังโปรไฟล์ของคุณตรงนี้ ส่วนไอคอนการยืนยันความเป็นเจ้าของนั้นก็สามารถแสดงถัดจากฟิลด์ได้นะ"
 _exportOrImport:
   allNotes: "โน้ตทั้งหมด"
   favoritedNotes: "บันทึกที่ชื่นชอบ"
@@ -2003,17 +1980,11 @@ _notification:
   youReceivedFollowRequest: "คุณมีคำขอติดตามใหม่น่ะ"
   yourFollowRequestAccepted: "คำขอติดตามของคุณได้รับการยอมรับแล้วน่ะ"
   pollEnded: "โพลสำรวจความคิดเห็นผลลัพธ์มีพร้อมใช้งาน"
-  newNote: "โพสต์ใหม่"
   unreadAntennaNote: "เสาอากาศ {name}"
   emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
   achievementEarned: "รับความสำเร็จ"
-  testNotification: "ทดสอบการแจ้งเตือน"
-  checkNotificationBehavior: "ตรวจสอบลักษณะที่ปรากฏการแจ้งเตือน"
-  sendTestNotification: "ส่งทดสอบการแจ้งเตือน"
-  notificationWillBeDisplayedLikeThis: "การแจ้งเตือนมีลักษณะแบบนี้"
   _types:
     all: "ทั้งหมด"
-    note: "โน้ตใหม่"
     follow: "กำลังติดตาม"
     mention: "กล่าวถึง"
     reply: "ตอบกลับ"
@@ -2083,34 +2054,3 @@ _webhookSettings:
     renote: "รีโน้ตแล้วเมื่อ"
     reaction: "เมื่อได้รับรีแอคชั่น"
     mention: "เมื่อกำลังถูกกล่าวถึง"
-_moderationLogTypes:
-  createRole: "สร้างบทบาทแล้ว"
-  deleteRole: "ลบบทบาทแล้ว"
-  updateRole: "อัปเดตบทบาทแล้ว"
-  assignRole: "ได้รับมอบหมายบทบาท"
-  unassignRole: "ถอดออกจากบทบาทแล้ว"
-  suspend: "ถูกระงับ"
-  unsuspend: "เลิกถูกระงับ"
-  addCustomEmoji: "เพิ่มอีโมจิที่กำหนดเองแล้ว"
-  updateCustomEmoji: "อัปเดตอีโมจิที่กำหนดเองแล้ว"
-  deleteCustomEmoji: "ลบอีโมจิที่กำหนดเองออกแล้ว"
-  updateServerSettings: "อัปเดตการตั้งค่าเซิร์ฟเวอร์แล้ว"
-  updateUserNote: "อัปเดตโน้ตการกลั่นกรองแล้ว"
-  deleteDriveFile: "ลบไฟล์ออกแล้ว"
-  deleteNote: "ลบโน้ตออกแล้ว"
-  createGlobalAnnouncement: "สร้างประกาศทั่วโลกแล้ว"
-  createUserAnnouncement: "สร้างประกาศผู้ใช้แล้ว"
-  updateGlobalAnnouncement: "อัปเดตประกาศทั่วโลกแล้ว"
-  updateUserAnnouncement: "อัปเดตประกาศผู้ใช้แล้ว"
-  deleteGlobalAnnouncement: "ลบประกาศทั่วโลกออกแล้ว"
-  deleteUserAnnouncement: "ลบประกาศผู้ใช้ออกแล้ว"
-  resetPassword: "รีเซ็ตรหัสผ่าน"
-  suspendRemoteInstance: "อินสแตนซ์ระยะไกลถูกระงับ"
-  unsuspendRemoteInstance: "อินสแตนซ์ระยะไกลเลิกการระงับ"
-  markSensitiveDriveFile: "ทำเครื่องหมายไฟล์บอกว่าละเอียดอ่อน"
-  unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่าละเอียดอ่อน"
-  resolveAbuseReport: "รายงานได้รับการแก้ไขแล้ว"
-  createInvitation: "สร้างคำเชิญ"
-  createAd: "สร้างโฆษณาแล้ว"
-  deleteAd: "ลบโฆษณาออกแล้ว"
-  updateAd: "อัปเดตโฆษณาแล้ว"

locales/tr-TR.yml

@@ -371,8 +371,6 @@ 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:
@@ -386,6 +384,7 @@ _theme:
 _sfx:
   note: "notlar"
   notification: "Bildirim"
+  chat: "Mesajlar"
 _2fa:
   renewTOTPCancel: "Hayır, teşekkürler"
 _permissions:
@@ -447,6 +446,3 @@ _deck:
     tl: "Zaman çizelgesi"
     list: "Listeler"
     mentions: "Bahsetmeler"
-_moderationLogTypes:
-  suspend: "askıya al"
-  resetPassword: "Şifre sıfırlama"

locales/uk-UA.yml

@@ -338,6 +338,7 @@ invite: "Запросити"
 driveCapacityPerLocalAccount: "Об'єм диска на одного локального користувача"
 driveCapacityPerRemoteAccount: "Об'єм диска на одного віддаленого користувача"
 inMb: "В мегабайтах"
+iconUrl: "URL аватара"
 bannerUrl: "URL банера"
 backgroundImageUrl: "URL-адреса фонового зображення"
 basicInfo: "Основна інформація"
@@ -905,8 +906,6 @@ letsLookAtTimeline: "Перегляд історії"
 horizontal: "Збоку"
 youFollowing: "Підписки"
 icon: "Аватар"
-replies: "Відповісти"
-renotes: "Поширити"
 _achievements:
   earnedAt: "Відкрито"
   _types:
@@ -1180,7 +1179,6 @@ _plugin:
   install: "Встановити плагін"
   installWarn: "Будь ласка, не встановлюйте плагінів, яким ви не довіряєте."
   manage: "Керування плагінами"
-  viewSource: "Переглянути вихідний код"
 _preferencesBackups:
   list: "Створені бекапи"
   saveNew: "Зберегти як новий"
@@ -1233,6 +1231,11 @@ _wordMute:
   muteWords: "Заглушені слова"
   muteWordsDescription: "Розділення ключових слів пробілами для \"І\" або з нової лінійки для \"АБО\""
   muteWordsDescription2: "Для використання RegEx, ключові слова потрібно вписати поміж слешів \"/\"."
+  softDescription: "Приховати записи які відповідають критеріям зі стрічки подій."
+  hardDescription: "Приховати записи які відповідають критеріям зі стрічки подій. Також приховані записи не будуть додані до стрічки подій навіть якщо критерії буде змінено."
+  soft: "М'яко"
+  hard: "Жорстко"
+  mutedNotes: "Заблоковані нотатки"
 _instanceMute:
   instanceMuteDescription2: "Розділяйте новими рядками"
   title: "Приховує нотатки з перелічених інстансів."
@@ -1290,6 +1293,9 @@ _theme:
     infoFg: "Текст інформації"
     infoWarnBg: "Фон попередження"
     infoWarnFg: "Текст попередження"
+    cwBg: "Фон чутливого змісту"
+    cwFg: "Текст чутливого змісту"
+    cwHoverBg: "Фон чутливого змісту (при наведенні)"
     toastBg: "Фон повідомлення"
     toastFg: "Текст повідомлення"
     buttonBg: "Фон кнопки"
@@ -1307,6 +1313,8 @@ _sfx:
   note: "Нотатки"
   noteMy: "Мої нотатки"
   notification: "Сповіщення"
+  chat: "Чати"
+  chatBg: "Чати (фон)"
   antenna: "Прийом антени"
   channel: "Повідомлення каналу"
 _ago:
@@ -1610,6 +1618,3 @@ _deck:
 _webhookSettings:
   name: "Ім'я"
   active: "Увімкнено"
-_moderationLogTypes:
-  suspend: "Призупинити"
-  resetPassword: "Скинути пароль"

locales/uz-UZ.yml

@@ -355,6 +355,7 @@ 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"
@@ -843,8 +844,6 @@ 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:
@@ -910,6 +909,7 @@ _theme:
 _sfx:
   note: "Qaydlar"
   notification: "Xabarnomalar"
+  chat: "Suhbat"
 _ago:
   minutesAgo: "{n} daqiqa oldin"
   hoursAgo: "{n} soat oldin"
@@ -1083,6 +1083,3 @@ _webhookSettings:
   _events:
     renote: "Qayta qayd qilinganda"
     mention: "Eslanganda"
-_moderationLogTypes:
-  suspend: "To'xtatish"
-  resetPassword: "Parolni tiklash"

locales/vi-VN.yml

@@ -1,5 +1,5 @@
 ---
-_lang_: "Tiếng Nhật"
+_lang_: "Tiếng Việ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ở"
@@ -45,7 +45,6 @@ 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."
@@ -157,7 +156,6 @@ 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"
@@ -356,6 +354,7 @@ 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"
@@ -411,13 +410,10 @@ 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"
@@ -993,95 +989,9 @@ 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: "Chuyển 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 chuyển"
-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"
-verifiedLink: "Chúng tôi đã xác nhận bạn là chủ sở hữu của đường dẫn này"
-_announcement:
-  forExistingUsers: "Chỉ những người dùng đã tồn tại"
-  forExistingUsersDescription: "Nếu được bật, thông báo này sẽ chỉ hiển thị với những người dùng đã tồn tại vào lúc thông báo được tạo. Nếu tắt đi, những tài khoản mới đăng ký sau khi thông báo được đăng lên cũng sẽ thấy nó."
-  end: "Lưu trữ thông báo"
-  tooManyActiveAnnouncementDescription: "Có quá nhiều thông báo sẽ làm trải nghiệm của người dùng tệ đi. Vui lòng lưu trữ những thông báo đã hết hiệu lực."
-  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ơ"
-  privacySetting: "Cài đặt quyền riêng tư"
-  theseSettingsCanEditLater: "Bạn vẫn có thể thay đổi những cài đặt này."
-  youCanEditMoreSettingsInSettingsPageLater: "Còn rất nhiều những cài đặt khác bạn có thể thay đổi ở trang \"Cài đặt\". Hãy nhớ ghé thăm trong lần sau nhé."
-  followUsers: "Thử theo dõi một vài người mà bạn có thể thích để xây dựng dòng thời gian của mình."
-  pushNotificationDescription: "Bật thông báo đẩy sẽ cho phép bạn nhận thông báo từ {name} trực tiếp từ thiết bị của bạn."
-  initialAccountSettingCompleted: "Thiết lập tài khoản thành công!"
-  haveFun: "Hãy tận hưởng {name} nhé!"
-  ifYouNeedLearnMore: "Nếu bạn muốn tìm hiểu thêm về cách sử dụng {name} (Misskey), hãy vào {link}."
-  skipAreYouSure: "Bạn thực sự muốn bỏ qua mục thiết lập tài khoản?"
-  laterAreYouSure: "Bạn thực sự muốn thiết lập tài khoản vào lúc khác?"
-_serverSettings:
-  iconUrl: "Biểu tượng URL"
-  appIconResolutionMustBe: "Độ phân giải tối thiểu là {resolution}."
-  manifestJsonOverride: "Ghi đè manifest.json"
-_accountMigration:
-  moveFrom: "Chuyển một tài khoản khác vào tài khoản này"
-  moveFromLabel: "Tài khoản gốc #{n}"
-  moveTo: "Chuyển tài khoản này vào một tài khoản khác"
-  moveCannotBeUndone: "Việc chuyển tài khoản không thể huỷ."
-  moveAccountDescription: "Điều này sẽ chuyển tài khoản này sang một tài khoản khác.\n　・Những người theo dõi sẽ tự động được chuyển sang tài khoản mới\n　・Tài khoản này sẽ tự bỏ theo dõi những người mà bạn đã theo dõi trước đây\n　・Bạn sẽ không thể đăng tút mới, v.v trên tài khoản này\n\nDù việc chuyển người theo dõi được diễn ra tự động, bạn vẫn phải tự chuẩn bị một vài bước để chuyển danh sách những người dùng bạn đang theo dõi. Để làm vậy, vui lòng thực hiện việc xuất dữ liệu những người dùng đã theo dõi mà sau này bạn sẽ dùng để nhập vào tài khoản mới ở menu Cài đặt. Hành động tương tự áp dụng với danh sách những người dùng bị chặn hoặc tắt tiếng.\n\n(Điều này áp dụng cho phiên bản Misskey v13.12.0 và sau này. Các phần mềm ActivityPub khác , ví dụ như Mastodon, sẽ có thể hoạt động khác đi.)"
-  startMigration: "Chuyển"
-  movedAndCannotBeUndone: "\nTài khoản này đã được chuyển đi.\nViệc di chuyển tài khoản không thể bị huỷ bỏ."
-  movedTo: "Tài khoản mới:"
 _achievements:
   earnedAt: "Ngày thu nhận"
   _types:
@@ -1120,8 +1030,6 @@ _achievements:
       title: "Hàng tinh đăng bài"
       description: "Đã đăng bài 50,000 lần rồi"
     _notes100000:
-      title: "ALL YOUR NOTE ARE BELONG TO US"
-      description: "Đăng 100,000 tút"
       flavor: "Liệu viết bài gì tầm này vậy? "
     _login3:
       title: "Sơ cấp I"
@@ -1153,15 +1061,6 @@ _achievements:
     _login400:
       title: "Khách hàng thường xuyên cấp III"
       description: "Tổng số ngày đăng nhập đạt 400 ngày"
-    _login1000:
-      flavor: "Cảm ơn bạn đã sử dụng Misskey!"
-    _noteFavorited1:
-      title: "Nhà thiên văn học"
-    _myNoteFavorited1:
-      title: "Đi tìm những ngôi sao"
-    _profileFilled:
-      title: "Luôn sẵn sàng"
-      description: "Thiết lập tài khoản của bạn"
     _markedAsCat:
       title: "Tôi là một con mèo"
       description: "Bật chế độ mèo"
@@ -1187,18 +1086,8 @@ _achievements:
     _followers10:
       title: "FOLLOW ME!!"
       description: "Người theo dõi bạn vượt lên 10 người"
-    _followers50:
-      title: "Từng chút một"
-      description: "Đạt được 50 lượt theo dõi"
-    _followers100:
-      title: "Người nổi tiếng"
-      description: "Đạt được 100 lượt theo dõi"
-    _followers300:
-      title: "Vui lòng xếp thành hàng nào"
-      description: "Đạt được 300 lượt theo dõi"
     _followers500:
       title: "Trạm phát sóng"
-      description: "Đạt được 500 lượt theo dõi"
     _followers1000:
       title: "Người có tầm ảnh hưởng"
       description: "Người theo dõi bạn vượt lên 1000 người"
@@ -1217,15 +1106,11 @@ _achievements:
       description: "Tìm thấy được những kho báu cất giấu"
     _client30min:
       title: "Giải lao xỉu"
-      description: "Giữ Misskey mở trong ít nhất 30 phút"
-    _client60min:
-      description: "Giữ Misskey mở trong ít nhất 60 phút"
     _noteDeletedWithin1min:
       title: "Xem như không có gì đâu nha"
     _postedAtLateNight:
       title: "Loài ăn đêm"
       description: "Đăng bài trong đêm khuya "
-      flavor: "Đến giờ đi ngủ rồi."
     _postedAt0min0sec:
       title: "Tín hiệu báo giờ"
       description: "Đăng bài vào 0 phút 0 giây"
@@ -1256,8 +1141,6 @@ _achievements:
     _setNameToSyuilo:
       title: "Ngưỡng mộ với vị thần"
       description: "Đạt tên là syuilo"
-    _passedSinceAccountCreated1:
-      title: "Kỷ niệm một năm"
     _loggedInOnBirthday:
       title: "Sinh nhật vủi vẻ"
       description: "Đăng nhập vào ngày sinh"
@@ -1343,7 +1226,6 @@ _plugin:
   install: "Cài đặt tiện ích"
   installWarn: "Vui lòng không cài đặt những tiện ích đáng ngờ."
   manage: "Quản lý plugin"
-  viewSource: "Xem mã nguồn"
 _preferencesBackups:
   list: "Tạo sao lưu"
   saveNew: "Lưu bản sao lưu"
@@ -1404,6 +1286,11 @@ _wordMute:
   muteWords: "Ẩn từ ngữ"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Bao quanh các từ khóa bằng dấu gạch chéo để sử dụng cụm từ thông dụng."
+  softDescription: "Ẩn các tút phù hợp điều kiện đã đặt khỏi bảng tin."
+  hardDescription: "Ngăn các tút đáp ứng các điều kiện đã đặt xuất hiện trên bảng tin. Lưu ý, những tút này sẽ không được thêm vào bảng tin ngay cả khi các điều kiện được thay đổi."
+  soft: "Yếu"
+  hard: "Mạnh"
+  mutedNotes: "Những tút đã ẩn"
 _instanceMute:
   instanceMuteDescription: "Thao tác này sẽ ẩn mọi tút/lượt đăng lại từ các máy chủ được liệt kê, bao gồm cả những tút  dạng trả lời từ máy chủ bị ẩn."
   instanceMuteDescription2: "Tách bằng cách xuống dòng"
@@ -1467,6 +1354,9 @@ _theme:
     infoFg: "Chữ thông tin"
     infoWarnBg: "Nền cảnh báo"
     infoWarnFg: "Chữ cảnh báo"
+    cwBg: "Nền nút nội dung ẩn"
+    cwFg: "Chữ nút nội dung ẩn"
+    cwHoverBg: "Nền nút nội dung ẩn (Chạm)"
     toastBg: "Nền thông báo"
     toastFg: "Chữ thông báo"
     buttonBg: "Nền nút"
@@ -1484,6 +1374,8 @@ _sfx:
   note: "Tút"
   noteMy: "Tút của tôi"
   notification: "Thông báo"
+  chat: "Trò chuyện"
+  chatBg: "Chat (Nền)"
   antenna: "Trạm phát sóng"
   channel: "Kênh"
 _ago:
@@ -1508,6 +1400,7 @@ _timelineTutorial:
 _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."
   step2Click: "Quét mã QR trên ứng dụng xác thực (Authy, Google authenticator, v.v.)"
@@ -1850,6 +1743,3 @@ _webhookSettings:
   _events:
     reaction: "Khi nhận được sự kiện"
     mention: "Khi có người nhắc tới bạn"
-_moderationLogTypes:
-  suspend: "Vô hiệu hóa"
-  resetPassword: "Đặt lại mật khẩu"

locales/zh-CN.yml

@@ -356,6 +356,7 @@ invite: "邀请"
 driveCapacityPerLocalAccount: "每个用户的网盘容量"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
 inMb: "以兆字节(MegaByte)为单位"
+iconUrl: "图标 URL"
 bannerUrl: "横幅 URL"
 backgroundImageUrl: "背景图 URL"
 basicInfo: "基本信息"
@@ -418,7 +419,6 @@ moderator: "监察员"
 moderation: "管理"
 moderationNote: "管理笔记"
 addModerationNote: "添加管理笔记"
-moderationLogs: "管理日志"
 nUsersMentioned: "{n} 被提到"
 securityKeyAndPasskey: "安全密钥或 Passkey"
 securityKey: "安全密钥"
@@ -711,7 +711,6 @@ lockedAccountInfo: "即使启用该功能，只要您不将帖子可见范围设
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
 loadRawImages: "添加附件图像的缩略图时使用原始图像质量"
 disableShowingAnimatedImages: "不播放动画"
-highlightSensitiveMedia: "高亮显示敏感媒体"
 verificationEmailSent: "已发送确认电子邮件。请访问电子邮件中的链接以完成设置。"
 notSet: "未设置"
 emailVerified: "电子邮件地址已验证"
@@ -1109,25 +1108,6 @@ currentAnnouncements: "现在的公告"
 pastAnnouncements: "过去的公告"
 youHaveUnreadAnnouncements: "您有未读的公告"
 useSecurityKey: "请根据浏览器或设备的提示，使用安全密钥或通行密钥。"
-replies: "回复"
-renotes: "转发"
-loadReplies: "查看回复"
-loadConversation: "查看对话"
-pinnedList: "已置顶的列表"
-keepScreenOn: "保持设备屏幕开启"
-verifiedLink: "已验证的链接"
-notifyNotes: "打开发帖通知"
-unnotifyNotes: "关闭发帖通知"
-authentication: "验证"
-authenticationRequiredToContinue: "要继续，请先进行验证"
-dateAndTime: "日期和时间"
-showRenotes: "显示转帖"
-edited: "已编辑"
-notificationRecieveConfig: "通知接收设置"
-mutualFollow: "互相关注"
-fileAttachedOnly: "仅限媒体"
-showRepliesToOthersInTimeline: "在时间线上显示给其他人的回复"
-hideRepliesToOthersInTimeline: "在时间线上隐藏给其他人的回复"
 _announcement:
   forExistingUsers: "仅限现有用户"
   forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。"
@@ -1154,15 +1134,6 @@ _initialAccountSetting:
   laterAreYouSure: "要稍后再进行初始设定吗？"
 _serverRules:
   description: "在新用户注册前显示服务器的简单规则。推荐显示服务条款的主要内容。"
-_serverSettings:
-  iconUrl: "图标 URL"
-  appIconDescription: "指定当 {host} 显示为 app 时的图标。"
-  appIconUsageExample: "例如：作为书签添加到 PWA 或手机主屏幕的时候"
-  appIconStyleRecommendation: "因为有可能会被裁切为圆形或者圆角矩形，建议使用边缘带有留白背景的图标。"
-  appIconResolutionMustBe: "分辨率必须为 {resolution}。"
-  manifestJsonOverride: "覆盖 mainfest.json"
-  shortName: "简称"
-  shortNameDescription: "如果服务器的正式名称很长，可以用简称或者別名来替代。"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
   moveFromSub: "为另一个账户建立别名"
@@ -1543,7 +1514,6 @@ _plugin:
   install: "安装插件"
   installWarn: "请不要安装不可信的插件。"
   manage: "管理插件..."
-  viewSource: "查看源代码"
 _preferencesBackups:
   list: "已创建的备份"
   saveNew: "另存为"
@@ -1610,6 +1580,11 @@ _wordMute:
   muteWords: "禁用词"
   muteWordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
   muteWordsDescription2: "正则表达式用斜线包裹"
+  softDescription: "隐藏时间线中指定条件的帖子。"
+  hardDescription: "防止将具有指定条件的帖子添加到时间线。 即使您更改条件，未添加的帖文也会被排除在外。"
+  soft: "软屏蔽"
+  hard: "硬屏蔽"
+  mutedNotes: "被屏蔽的帖子"
 _instanceMute:
   instanceMuteDescription: "屏蔽服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
   instanceMuteDescription2: "一行一个"
@@ -1673,6 +1648,9 @@ _theme:
     infoFg: "信息文本"
     infoWarnBg: "警告背景"
     infoWarnFg: "警告文本"
+    cwBg: "隐藏内容按钮背景"
+    cwFg: "隐藏内容按钮文本"
+    cwHoverBg: "隐藏内容按钮背景（悬停）"
     toastBg: "Toast 通知背景"
     toastFg: "Toast 通知文本"
     buttonBg: "按钮背景"
@@ -1690,6 +1668,8 @@ _sfx:
   note: "帖子"
   noteMy: "我的帖子"
   notification: "通知"
+  chat: "聊天"
+  chatBg: "聊天背景"
   antenna: "天线接收"
   channel: "频道通知"
 _ago:
@@ -1721,6 +1701,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "此设备已被注册"
   registerTOTP: "开始设置认证应用"
+  passwordToTOTP: "请输入您的密码"
   step1: "首先，在您的设备上安装验证应用，例如 {a} 或 {b}。"
   step2: "然后，扫描屏幕上显示的二维码。"
   step2Click: "通过点击二维码，您可以使用设备上安装的身份验证器应用程序或密钥环进行注册"
@@ -1799,7 +1780,6 @@ _antennaSources:
   homeTimeline: "已关注用户的帖子"
   users: "来自指定用户的帖子"
   userList: "来自指定列表中的帖子"
-  userBlacklist: "除掉已选择用户后所有的帖子"
 _weekday:
   sunday: "星期日"
   monday: "星期一"
@@ -1899,7 +1879,6 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "修改头像"
   changeBanner: "修改横幅"
-  verifiedLinkDescription: "如果将内容设置为 URL，当链接所指向的网页内包含自己的个人资料链接时，可以显示一个已验证图标。"
 _exportOrImport:
   allNotes: "所有帖子"
   favoritedNotes: "收藏的帖子"
@@ -2018,7 +1997,6 @@ _notification:
   youReceivedFollowRequest: "您有新的关注请求"
   yourFollowRequestAccepted: "您的关注请求已通过"
   pollEnded: "问卷调查结果已生成。"
-  newNote: "新的帖子"
   unreadAntennaNote: "天线 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
   achievementEarned: "获得成就"
@@ -2028,7 +2006,6 @@ _notification:
   notificationWillBeDisplayedLikeThis: "通知将会这样表示"
   _types:
     all: "全部"
-    note: "用户的新帖子"
     follow: "关注中"
     mention: "提及"
     reply: "回复"
@@ -2098,32 +2075,3 @@ _webhookSettings:
     renote: "被转发时"
     reaction: "被回应时"
     mention: "被提及时"
-_moderationLogTypes:
-  createRole: "创建角色"
-  deleteRole: "删除角色"
-  updateRole: "更新角色"
-  assignRole: "分配角色"
-  unassignRole: "取消分配角色"
-  suspend: "冻结"
-  unsuspend: "解除冻结"
-  addCustomEmoji: "添加自定义表情符号"
-  updateCustomEmoji: "更新自定义表情符号"
-  deleteCustomEmoji: "删除自定义表情符号"
-  updateServerSettings: "更新服务器设置"
-  updateUserNote: "更新管理笔记"
-  deleteDriveFile: "删除文件"
-  deleteNote: "删除帖子"
-  createGlobalAnnouncement: "创建全体通知"
-  createUserAnnouncement: "创建用户通知"
-  updateGlobalAnnouncement: "更新全体通知"
-  updateUserAnnouncement: "更新用户通知"
-  deleteGlobalAnnouncement: "删除全体通知"
-  deleteUserAnnouncement: "删除用户通知"
-  resetPassword: "重置密码"
-  markSensitiveDriveFile: "标记网盘文件为敏感媒体"
-  unmarkSensitiveDriveFile: "取消标记网盘文件为敏感媒体"
-  resolveAbuseReport: "处理举报"
-  createInvitation: "发行邀请码"
-  createAd: "创建了广告"
-  deleteAd: "删除了广告"
-  updateAd: "更新了广告"

locales/zh-TW.yml

@@ -1,6 +1,6 @@
 ---
-_lang_: "繁體中文（台灣）"
-headlineMisskey: "貼文連繫網路"
+_lang_: "繁體中文"
+headlineMisskey: "貼文連繫網絡"
 introMisskey: "歡迎！Misskey 是一個開放原始碼且去中心化的社群網路服務。\n發布「貼文」向身邊的人分享您的想法！📡\n利用「反應」表達您對貼文的感覺！👍\n讓我們一起探索新的世界吧！🚀"
 poweredByMisskeyDescription: "{name}是開放原始碼平臺 <b>Misskey</b> 的伺服器之一。"
 monthAndDay: "{month} 月 {day} 日"
@@ -45,7 +45,7 @@ pin: "置頂"
 unpin: "取消置頂"
 copyContent: "複製內容"
 copyLink: "複製連結"
-copyLinkRenote: "複製轉發的連結"
+copyLinkRenote: "複製轉貼連結"
 delete: "刪除"
 deleteAndEdit: "刪除並編輯"
 deleteAndEditConfirm: "要刪除並再次編輯嗎？此貼文的所有反應、轉發和回覆也將會消失。"
@@ -56,7 +56,7 @@ copyRSS: "複製RSS"
 copyUsername: "複製使用者名稱"
 copyUserId: "複製使用者 ID"
 copyNoteId: "複製貼文 ID"
-copyFileId: "複製檔案 ID"
+copyFileId: "複製檔案ID"
 copyFolderId: "複製資料夾ID"
 copyProfileUrl: "複製個人資料網址"
 searchUser: "搜尋使用者"
@@ -75,9 +75,9 @@ import: "匯入"
 export: "匯出"
 files: "檔案"
 download: "下載"
-driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此檔案的貼文也會跟著被刪除。"
+driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此附件的貼文也會跟著消失。\n"
 unfollowConfirm: "確定要取消追隨{name}嗎？"
-exportRequested: "已請求匯出。這可能會花一點時間。匯出的檔案將會被放到雲端硬碟裡。"
+exportRequested: "已請求匯出。這可能會花一點時間。匯出的檔案將會被放到雲端裡。"
 importRequested: "已請求匯入。這可能會花一點時間。"
 lists: "清單"
 noLists: "你沒有任何清單"
@@ -107,7 +107,7 @@ followRequestPending: "追隨許可待批准"
 enterEmoji: "輸入表情符號"
 renote: "轉發"
 unrenote: "取消轉發"
-renoted: "轉發成功。"
+renoted: "轉發成功"
 cantRenote: "無法轉發此貼文。"
 cantReRenote: "無法轉發之前已經轉發過的內容。"
 quote: "引用"
@@ -138,8 +138,8 @@ suspend: "凍結"
 unsuspend: "解除凍結"
 blockConfirm: "確定要封鎖此使用者嗎？"
 unblockConfirm: "確定要解除封鎖此使用者嗎？"
-suspendConfirm: "確定凍結此使用者？"
-unsuspendConfirm: "確定解凍此使用者？"
+suspendConfirm: "確定凍結此帳戶？"
+unsuspendConfirm: "確定解凍此帳戶？"
 selectList: "選擇清單"
 editList: "編輯清單"
 selectChannel: "選擇頻道"
@@ -152,20 +152,20 @@ customEmojis: "自訂表情符號"
 emoji: "表情符號"
 emojis: "表情符號"
 emojiName: "表情符號名稱"
-emojiUrl: "表情符號 URL"
+emojiUrl: "表情符號URL"
 addEmoji: "新增表情符號"
 settingGuide: "推薦設定"
 cacheRemoteFiles: "快取遠端檔案"
-cacheRemoteFilesDescription: "啟用此設定後，遠端檔案會被快取在本伺服器的儲存空間中。雖然顯示圖片會變快，但會消耗較多伺服器的儲存空間。至於要快取遠端使用者到什麼程度，是依照角色的雲端硬碟容量而定。當超過這個限制時，從較舊的檔案開始自快取中刪除並改為連結。關閉這個設定時，遠端檔案從一開始就維持連結的方式，但建議將 default.yml 的 proxyRemoteFiles 設為 true，以便產生圖片的縮圖並保護使用者的隱私。"
-youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，可將快取全部刪除。"
+cacheRemoteFilesDescription: "禁用此設定會停止建立遠端檔案快取，從而節省伺服器儲存空間，但會因從遠端讀取資料而增加網路數據用量。"
+youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，將快取全部刪除。"
 cacheRemoteSensitiveFiles: "快取遠端的敏感檔案"
 cacheRemoteSensitiveFilesDescription: "若停用這個設定，則不會快取遠端的敏感檔案，而是直接連結。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "標記本帳戶由程式控制，防止其他程式與本帳戶產生無限互動的行為。"
 flagAsCat: "此帳戶是一隻貓，喵～～～！！！"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
-flagShowTimelineRepliesDescription: "啟用後，時間軸除了顯示使用者的貼文以外，還會顯示使用者對其他貼文的回覆。"
+flagShowTimelineRepliesDescription: "啟用時，時間軸除了顯示使用者的貼文以外，還會顯示使用者對其他貼文的回覆。"
 autoAcceptFollowed: "自動允許來自追隨中使用者的追隨請求"
 addAccount: "新增帳戶"
 reloadAccountsList: "更新帳戶清單的資訊"
@@ -184,7 +184,7 @@ host: "主機"
 selectUser: "選取使用者"
 recipient: "收件人"
 annotation: "註解"
-federation: "站台聯邦"
+federation: "聯邦宇宙"
 instances: "伺服器"
 registeredAt: "初次觀測"
 latestRequestReceivedAt: "上次收到的請求"
@@ -321,7 +321,7 @@ copyUrl: "複製URL"
 rename: "重新命名"
 avatar: "大頭貼"
 banner: "橫幅"
-displayOfSensitiveMedia: "敏感檔案的顯示"
+displayOfSensitiveMedia: "顯示敏感媒體"
 whenServerDisconnected: "與伺服器的連接中斷時"
 disconnectedFromServer: "與伺服器中斷連線"
 reload: "重新整理"
@@ -356,6 +356,7 @@ invite: "邀請"
 driveCapacityPerLocalAccount: "每個本地使用者的雲端硬碟容量"
 driveCapacityPerRemoteAccount: "每個非本地用戶的雲端空間大小"
 inMb: "以Mbps為單位"
+iconUrl: "圖標 URL（例如 favicon）"
 bannerUrl: "橫幅圖片URL"
 backgroundImageUrl: "背景圖片的來源網址 "
 basicInfo: "基本資訊"
@@ -418,13 +419,12 @@ moderator: "審查員"
 moderation: "審查"
 moderationNote: "管理筆記"
 addModerationNote: "新增管理筆記"
-moderationLogs: "管理日誌"
-nUsersMentioned: "被 {n} 個人提及"
+nUsersMentioned: "被提及到 {n} 次"
 securityKeyAndPasskey: "安全金鑰、Passkey"
 securityKey: "安全金鑰"
 lastUsed: "上次使用"
 lastUsedAt: "上次使用：{t}"
-unregister: "註銷"
+unregister: "註銷帳戶"
 passwordLessLogin: "設置無密碼登入"
 passwordLessLoginDescription: "不使用密碼，以安全金鑰或 Passkey 登入"
 resetPassword: "重設密碼"
@@ -491,7 +491,7 @@ createAccount: "建立帳戶"
 existingAccount: "現有帳戶"
 regenerate: "再次生成"
 fontSize: "字體大小"
-mediaListWithOneImageAppearance: "只有一張圖片時的檔案列表高度"
+mediaListWithOneImageAppearance: "只有一張圖片時的媒體列表高度"
 limitTo: "上限為 {x}"
 noFollowRequests: "沒有追隨您的請求"
 openImageInNewTab: "於新分頁中開啟圖片"
@@ -509,8 +509,8 @@ promote: "推廣"
 numberOfDays: "有效天數"
 hideThisNote: "隱藏此貼文"
 showFeaturedNotesInTimeline: "在時間軸上顯示熱門推薦"
-objectStorage: "物件儲存"
-useObjectStorage: "使用物件儲存"
+objectStorage: "對象存儲"
+useObjectStorage: "使用對象存儲"
 objectStorageBaseUrl: "Base URL"
 objectStorageBaseUrlDesc: "用於引用的 URL。如果您使用的是 CDN 或反向代理，請指定其 URL，例如 S3（https://<bucket>.s3.amazonaws.com）、GCS（https://storage.googleapis.com/<bucket>）。"
 objectStorageBucket: "儲存空間（Bucket）"
@@ -547,7 +547,7 @@ recentUsed: "最近使用"
 install: "安裝"
 uninstall: "解除安裝"
 installedApps: "已授權的應用程式"
-nothing: "查無項目"
+nothing: "無"
 installedDate: "安裝時間"
 lastUsedDate: "最後上線日期"
 state: "狀態"
@@ -573,7 +573,7 @@ tokenRevokedDescription: "登入權杖失效，請重新登入。"
 accountDeleted: "帳戶已被刪除"
 accountDeletedDescription: "這個帳戶已被刪除。"
 menu: "選單"
-divider: "分隔線"
+divider: "分割線"
 addItem: "新增項目"
 rearrange: "排序方式"
 relays: "中繼"
@@ -582,7 +582,7 @@ inboxUrl: "收件夾URL"
 addedRelays: "已加入的中繼"
 serviceworkerInfo: "您需要啟用推送通知。"
 deletedNote: "已刪除的貼文"
-invisibleNote: "私密的貼文"
+invisibleNote: "隱藏的貼文"
 enableInfiniteScroll: "啟用自動滾動頁面模式"
 visibility: "可見性"
 poll: "投票"
@@ -658,7 +658,7 @@ behavior: "行為"
 sample: "範例"
 abuseReports: "檢舉"
 reportAbuse: "檢舉"
-reportAbuseRenote: "檢舉轉發貼文"
+reportAbuseRenote: "檢舉轉貼"
 reportAbuseOf: "檢舉{name}"
 fillAbuseReportDescription: "請填寫檢舉的詳細理由。如有需要，請附上相關 URL。"
 abuseReported: "檢舉完成。感謝您的報告。"
@@ -708,10 +708,9 @@ driveUsage: "雲端硬碟使用量"
 noCrawle: "拒絕搜尋引擎索引"
 noCrawleDescription: "要求網路搜尋引擎不要索引你的個人資料頁、貼文及頁面等。"
 lockedAccountInfo: "即使你通過了追隨者請求，除非你將貼文的可見性設定為 「追隨者」，否則任何人都能看見你的貼文。"
-alwaysMarkSensitive: "預設標記檔案為敏感內容"
+alwaysMarkSensitive: "預設將多媒體標記為敏感內容"
 loadRawImages: "以原始圖檔顯示附件圖檔的縮圖"
 disableShowingAnimatedImages: "不播放動態圖檔"
-highlightSensitiveMedia: "強調敏感標記"
 verificationEmailSent: "已發送驗證電子郵件。請點擊進入電子郵件中的鏈接完成驗證。"
 notSet: "未設定"
 emailVerified: "已成功驗證您的電郵"
@@ -928,7 +927,7 @@ type: "類型"
 speed: "速度"
 slow: "慢"
 fast: "快"
-sensitiveMediaDetection: "敏感檔案的檢測"
+sensitiveMediaDetection: "敏感性媒體的檢測"
 localOnly: "僅限本地"
 remoteOnly: "僅限遠端"
 failedToUpload: "上傳失敗"
@@ -937,7 +936,7 @@ cannotUploadBecauseNoFreeSpace: "由於雲端硬碟沒有可用空間，因此
 cannotUploadBecauseExceedsFileSizeLimit: "由於超過了檔案大小的限制，無法上傳。"
 beta: "測試版"
 enableAutoSensitive: "自動 NSFW 判定"
-enableAutoSensitiveDescription: "如果可用，它將使用機器學習技術判斷檔案是否需要標記為敏感。即使關閉此功能，也可能會依實例規則而自動啟用。"
+enableAutoSensitiveDescription: "如果可用，它將使用機器學習技術判斷多媒體內容是否需要標記 NSFW。即使關閉此功能，也可能會依實例規則而自動啟用。"
 activeEmailValidationDescription: "積極驗證使用者的電郵地址，以判斷它是否可以通訊。關閉此選項代表只會檢查地址是否符合格式。"
 navbar: "導覽列"
 shuffle: "隨機"
@@ -1109,32 +1108,6 @@ currentAnnouncements: "最新公告"
 pastAnnouncements: "歷史公告"
 youHaveUnreadAnnouncements: "有未讀的公告。"
 useSecurityKey: "請按照瀏覽器或設備上的說明使用安全金鑰或 Passkey。"
-replies: "回覆"
-renotes: "轉發"
-loadReplies: "閱覽回覆"
-loadConversation: "閱覽對話"
-pinnedList: "已置頂的清單"
-keepScreenOn: "保持設備螢幕開啟"
-verifiedLink: "已驗證連結"
-notifyNotes: "開啟貼文通知"
-unnotifyNotes: "關閉貼文通知"
-authentication: "驗證"
-authenticationRequiredToContinue: "請於繼續前完成驗證"
-dateAndTime: "日期與時間"
-showRenotes: "顯示轉發貼文"
-edited: "已編輯"
-notificationRecieveConfig: "接受通知的設定"
-mutualFollow: "互相追隨"
-fileAttachedOnly: "包含附件"
-showRepliesToOthersInTimeline: "在時間軸上顯示給其他人的回覆"
-hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆"
-externalServices: "外部服務"
-impressum: "營運者資訊"
-impressumUrl: "營運者資訊網址"
-impressumDescription: "在德國與部份地區必須要明確顯示營運者資訊。"
-privacyPolicy: "隱私政策"
-privacyPolicyUrl: "隱私政策網址"
-tosAndPrivacyPolicy: "服務條款和隱私政策"
 _announcement:
   forExistingUsers: "僅限既有的使用者"
   forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。"
@@ -1161,15 +1134,6 @@ _initialAccountSetting:
   laterAreYouSure: "稍後再重新進行初始設定嗎？"
 _serverRules:
   description: "設定在註冊頁面顯示的伺服器簡要規則。建議是服務條款的摘要。"
-_serverSettings:
-  iconUrl: "圖示的 URL"
-  appIconDescription: "指定顯示 {host} 為應用程式時的圖示。"
-  appIconUsageExample: "例如：漸進式網路應用程式（PWA）、於手機桌面新增書籤"
-  appIconStyleRecommendation: "因為可能會裁剪成圓形或圓角，所以建議用單色填滿邊框及背景。"
-  appIconResolutionMustBe: "解析度必須為 {resolution}。"
-  manifestJsonOverride: "覆寫 manifest.json"
-  shortName: "簡稱"
-  shortNameDescription: "如果伺服器的正式名稱很長，可用簡稱或通稱代替。"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
   moveFromSub: "為另一個帳戶建立別名"
@@ -1484,7 +1448,6 @@ _role:
     descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
     canHideAds: "不顯示廣告"
     canSearchNotes: "可否搜尋貼文"
-    canUseTranslator: "使用翻譯功能"
   _condition:
     isLocal: "本地使用者"
     isRemote: "遠端使用者"
@@ -1500,7 +1463,7 @@ _role:
     or: "～或～"
     not: "～否"
 _sensitiveMediaDetection:
-  description: "您可以使用機器學習自動檢測敏感檔案以便審查。這會稍微增加伺服器負荷。"
+  description: "您可以使用機器學習自動檢測敏感媒體並將其用於審查。 伺服器的負荷會稍微增加。"
   sensitivity: "檢測敏感度"
   sensitivityDescription: "敏感度低時，誤檢測（偽陽性）會減少。敏感度高時，漏檢（偽陰性）會減少。"
   setSensitiveFlagAutomatically: "設定 NSFW 標籤"
@@ -1533,10 +1496,6 @@ _ad:
   reduceFrequencyOfThisAd: "降低此廣告的頻率 "
   hide: "隱藏"
   timezoneinfo: "星期幾是由伺服器的時區指定的。"
-  adsSettings: "廣告投放設定"
-  notesPerOneAd: "即時更新中投放廣告的間隔（貼文數）"
-  setZeroToDisable: "設為 0 則在即時更新時不投放廣告"
-  adsTooClose: "由於廣告投放的間隔極短，可能會嚴重影響使用者體驗。"
 _forgotPassword:
   enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
   ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
@@ -1555,7 +1514,6 @@ _plugin:
   install: "安裝外掛組件"
   installWarn: "請不要安裝來源不明的外掛。"
   manage: "管理外掛"
-  viewSource: "檢視原始碼"
 _preferencesBackups:
   list: "已備份的設定檔"
   saveNew: "另存新檔"
@@ -1590,13 +1548,13 @@ _aboutMisskey:
   morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
   patrons: "贊助者"
 _displayOfSensitiveMedia:
-  respect: "隱藏敏感檔案"
-  ignore: "顯示敏感檔案"
-  force: "隱藏所有檔案"
+  respect: "隱藏被標記為敏感的多媒體內容"
+  ignore: "不隱藏被標記為敏感的多媒體內容"
+  force: "隱藏所有多媒體內容"
 _instanceTicker:
   none: "隱藏"
-  remote: "只顯示遠端使用者"
-  always: "一律顯示"
+  remote: "向遠端使用者顯示"
+  always: "總是顯示"
 _serverDisconnectedBehavior:
   reload: "自動重載"
   dialog: "彈出式警告"
@@ -1622,9 +1580,14 @@ _wordMute:
   muteWords: "加入靜音文字"
   muteWordsDescription: "空格代表「以及」（AND），換行代表「或者」（OR）。"
   muteWordsDescription2: "用斜線包圍關鍵字代表正規表達式。"
+  softDescription: "隱藏時間軸中符合特定條件的貼文。"
+  hardDescription: "符合特定條件的貼文將不會新增至時間軸。 即使您更改條件，未被新增的貼文也會被排除在外。"
+  soft: "軟性靜音"
+  hard: "硬性靜音"
+  mutedNotes: "已靜音的貼文"
 _instanceMute:
   instanceMuteDescription: "包括對被靜音實例上的使用者的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
-  instanceMuteDescription2: "設定時以換行進行分隔"
+  instanceMuteDescription2: "換行以分隔"
   title: "將隱藏被設定的實例貼文。"
   heading: "將實例靜音"
 _theme:
@@ -1677,7 +1640,7 @@ _theme:
     mentionMe: "提到了我"
     renote: "轉發貼文"
     modalBg: "對話框背景"
-    divider: "分隔線"
+    divider: "分割線"
     scrollbarHandle: "捲動條"
     scrollbarHandleHover: "捲動條（懸浮）"
     dateLabelFg: "日期標籤文字"
@@ -1685,6 +1648,9 @@ _theme:
     infoFg: "資訊內容"
     infoWarnBg: "警告背景"
     infoWarnFg: "警告文字"
+    cwBg: "隱藏內容按鈕背景"
+    cwFg: "隱藏內容按鈕文字"
+    cwHoverBg: "隱藏內容按鈕背景（懸浮）"
     toastBg: "通知背景"
     toastFg: "通知文本"
     buttonBg: "按鈕背景"
@@ -1702,13 +1668,15 @@ _sfx:
   note: "貼文"
   noteMy: "我的貼文"
   notification: "通知"
+  chat: "聊天"
+  chatBg: "聊天背景"
   antenna: "天線接收"
   channel: "頻道通知"
 _ago:
   future: "未來"
   justNow: "剛剛"
   secondsAgo: "{n} 秒前"
-  minutesAgo: "{n} 分鐘前 "
+  minutesAgo: "{n}分鐘前 "
   hoursAgo: "{n} 小時前"
   daysAgo: "{n} 天前"
   weeksAgo: "{n} 週前"
@@ -1733,6 +1701,7 @@ _timelineTutorial:
 _2fa:
   alreadyRegistered: "此裝置已被註冊過了"
   registerTOTP: "開始設定驗證應用程式"
+  passwordToTOTP: "請輸入密碼"
   step1: "首先，在您的裝置上安裝驗證程式，例如 {a} 或 {b}。"
   step2: "然後，掃描螢幕上的 QR 碼。"
   step2Click: "您可以點擊 QR 碼，以使用裝置上的驗證應用程式或金鑰環註冊。"
@@ -1811,7 +1780,6 @@ _antennaSources:
   homeTimeline: "來自已追隨使用者的貼文"
   users: "來自特定使用者的貼文"
   userList: "來自特定清單中的貼文"
-  userBlacklist: "除指定使用者外的所有貼文"
 _weekday:
   sunday: "週日"
   monday: "週一"
@@ -1911,7 +1879,6 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "更換大頭貼"
   changeBanner: "變更橫幅圖像"
-  verifiedLinkDescription: "如果輸入包含您個人資料的網站 URL，欄位旁邊將出現驗證圖示。"
 _exportOrImport:
   allNotes: "所有貼文"
   favoritedNotes: "「我的最愛」貼文"
@@ -2030,7 +1997,6 @@ _notification:
   youReceivedFollowRequest: "您有新的追隨請求"
   yourFollowRequestAccepted: "您的追隨請求已通過"
   pollEnded: "問卷調查已產生結果"
-  newNote: "新的貼文"
   unreadAntennaNote: "天線 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
   achievementEarned: "獲得成就"
@@ -2040,7 +2006,6 @@ _notification:
   notificationWillBeDisplayedLikeThis: "通知會以這樣的方式顯示"
   _types:
     all: "全部 "
-    note: "使用者的最新貼文"
     follow: "追隨中"
     mention: "提及"
     reply: "回覆"
@@ -2110,42 +2075,3 @@ _webhookSettings:
     renote: "當被轉發時"
     reaction: "當獲得反應時"
     mention: "當被提到時"
-_moderationLogTypes:
-  createRole: "新增角色"
-  deleteRole: "刪除角色 "
-  updateRole: "更新角色設定"
-  assignRole: "指派角色"
-  unassignRole: "撤銷角色"
-  suspend: "凍結"
-  unsuspend: "解除凍結"
-  addCustomEmoji: "新增自訂表情符號"
-  updateCustomEmoji: "更新自訂表情符號"
-  deleteCustomEmoji: "刪除自訂表情符號"
-  updateServerSettings: "更新伺服器設定"
-  updateUserNote: "更新管理筆記"
-  deleteDriveFile: "刪除檔案"
-  deleteNote: "刪除貼文"
-  createGlobalAnnouncement: "建立全網通知"
-  createUserAnnouncement: "建立使用者通知"
-  updateGlobalAnnouncement: "更新全部的公告"
-  updateUserAnnouncement: "更新使用者的公告"
-  deleteGlobalAnnouncement: "刪除全部的公告"
-  deleteUserAnnouncement: "刪除使用者的公告"
-  resetPassword: "重設密碼"
-  suspendRemoteInstance: "封鎖遠端伺服器"
-  unsuspendRemoteInstance: "解除封鎖遠端伺服器"
-  markSensitiveDriveFile: "標記為敏感檔案"
-  unmarkSensitiveDriveFile: "撤銷標記為敏感檔案"
-  resolveAbuseReport: "解決檢舉"
-  createInvitation: "建立邀請碼"
-  createAd: "建立廣告"
-  deleteAd: "刪除廣告"
-  updateAd: "更新廣告"
-_fileViewer:
-  title: "檔案詳細資訊"
-  type: "檔案類型 "
-  size: "檔案大小"
-  url: "URL"
-  uploadedAt: "加入日期"
-  attachedNotes: "含有附件的貼文"
-  thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2023.10.1",
+	"version": "2023.9.0-beta.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@8.8.0",
+	"packageManager": "pnpm@8.7.5",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -46,17 +46,17 @@
 		"execa": "8.0.1",
 		"cssnano": "6.0.1",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.31",
-		"terser": "5.21.0",
+		"postcss": "8.4.29",
+		"terser": "5.19.4",
 		"typescript": "5.2.2"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "6.7.5",
-		"@typescript-eslint/parser": "6.7.5",
+		"@typescript-eslint/eslint-plugin": "6.7.0",
+		"@typescript-eslint/parser": "6.7.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.0",
-		"eslint": "8.51.0",
-		"start-server-and-test": "2.0.1"
+		"cypress": "13.2.0",
+		"eslint": "8.49.0",
+		"start-server-and-test": "2.0.0"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.4.0"

packages/backend/jest.config.cjs

@@ -216,6 +216,4 @@ module.exports = {
 	maxWorkers: 1, // Make it use worker (that can be killed and restarted)
 	logHeapUsage: true, // To debug when out-of-memory happens on CI
 	workerIdleMemoryLimit: '1GiB', // Limit the worker to 1GB (GitHub Workflows dies at 2GB)
-
-	maxConcurrency: 32,
 };

packages/backend/migration/1689325027964-UserBlacklistAnntena.js

@@ -1,10 +0,0 @@
-export class UserBlacklistAnntena1689325027964 {
-    name = 'UserBlacklistAnntena1689325027964'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TYPE "antenna_src_enum" ADD VALUE 'users_blacklist' AFTER 'list'`);
-    }
-
-    async down(queryRunner) {
-    }
-}

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

@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class ServerIconsAndManifest1694850832075 {
     name = 'ServerIconsAndManifest1694850832075'
 

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

@@ -1,16 +0,0 @@
-/*
- * 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

@@ -1,11 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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/migration/1695440131671-short-name.js

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

packages/backend/migration/1695605508898-mutingNotificationTypes.js

@@ -1,21 +0,0 @@
-export class MutingNotificationTypes1695605508898 {
-    name = 'MutingNotificationTypes1695605508898'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" RENAME TO "user_profile_mutingnotificationtypes_enum_old"`);
-        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum" AS ENUM('note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'achievementEarned', 'app', 'test', 'pollVote', 'groupInvited')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum"[]`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
-        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum_old"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
-        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`);
-        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`);
-    }
-}

packages/backend/migration/1695901659683-note-updated-at.js

@@ -1,11 +0,0 @@
-export class NoteUpdatedAt1695901659683 {
-    name = 'NoteUpdatedAt1695901659683'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
-    }
-}

packages/backend/migration/1695944637565-notificationRecieveConfig.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class NotificationRecieveConfig1695944637565 {
-    name = 'NotificationRecieveConfig1695944637565'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutingNotificationTypes"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "notificationRecieveConfig" jsonb NOT NULL DEFAULT '{}'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "notificationRecieveConfig"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutingNotificationTypes" "public"."user_profile_notificationrecieveconfig_enum" array NOT NULL DEFAULT '{}'`);
-    }
-}

packages/backend/migration/1696003580220-AddSomeUrls.js

@@ -1,17 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class AddSomeUrls1696003580220 {
-    name = 'AddSomeUrls1696003580220'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "impressumUrl" character varying(1024)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "privacyPolicyUrl" character varying(1024)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "impressumUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "privacyPolicyUrl"`);
-    }
-}

packages/backend/migration/1696222183852-withReplies.js

@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class WithReplies1696222183852 {
-    name = 'WithReplies1696222183852'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "following" ADD "withReplies" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" ADD "withReplies" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_d74d8ab5efa7e3bb82825c0fa2" ON "following" ("followeeId", "followerHost") `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_d74d8ab5efa7e3bb82825c0fa2"`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" DROP COLUMN "withReplies"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "withReplies"`);
-    }
-}

packages/backend/migration/1696323464251-user-list-membership.js

@@ -1,11 +0,0 @@
-export class UserListMembership1696323464251 {
-    name = 'UserListMembership1696323464251'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_joining" RENAME TO "user_list_membership"`);
-    }
-
-    async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user_list_membership" RENAME TO "user_list_joining"`);
-    }
-}

packages/backend/migration/1696331570827-hibernation.js

@@ -1,17 +0,0 @@
-export class Hibernation1696331570827 {
-    name = 'Hibernation1696331570827'
-
-    async up(queryRunner) {
-				await queryRunner.query(`DROP INDEX "public"."IDX_d74d8ab5efa7e3bb82825c0fa2"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "isHibernated" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "following" ADD "isFollowerHibernated" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_ce62b50d882d4e9dee10ad0d2f" ON "following" ("followeeId", "followerHost", "isFollowerHibernated") `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_ce62b50d882d4e9dee10ad0d2f"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "isFollowerHibernated"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isHibernated"`);
-        await queryRunner.query(`CREATE INDEX "IDX_d74d8ab5efa7e3bb82825c0fa2" ON "following" ("followeeId", "followerHost") `);
-    }
-}

packages/backend/migration/1696332072038-clean.js

@@ -1,33 +0,0 @@
-export class Clean1696332072038 {
-    name = 'Clean1696332072038'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_d844bfc6f3f523a05189076efaa"`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_605472305f26818cc93d1baaa74"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d844bfc6f3f523a05189076efa"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_605472305f26818cc93d1baaa7"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_90f7da835e4c10aca6853621e1"`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "preservedUsernames" SET DEFAULT '{ "admin", "administrator", "root", "system", "maintainer", "host", "mod", "moderator", "owner", "superuser", "staff", "auth", "i", "me", "everyone", "all", "mention", "mentions", "example", "user", "users", "account", "accounts", "official", "help", "helps", "support", "supports", "info", "information", "informations", "announce", "announces", "announcement", "announcements", "notice", "notification", "notifications", "dev", "developer", "developers", "tech", "misskey" }'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_membership"."createdAt" IS 'The created date of the UserListMembership.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_021015e6683570ae9f6b0c62be" ON "user_list_membership" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_cddcaf418dc4d392ecfcca842a" ON "user_list_membership" ("userListId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e4f3094c43f2d665e6030b0337" ON "user_list_membership" ("userId", "userListId") `);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_021015e6683570ae9f6b0c62bee" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_cddcaf418dc4d392ecfcca842a7" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_cddcaf418dc4d392ecfcca842a7"`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_021015e6683570ae9f6b0c62bee"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e4f3094c43f2d665e6030b0337"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_cddcaf418dc4d392ecfcca842a"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_021015e6683570ae9f6b0c62be"`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_membership"."createdAt" IS 'The created date of the UserListJoining.'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "preservedUsernames" SET DEFAULT '{admin,administrator,root,system,maintainer,host,mod,moderator,owner,superuser,staff,auth,i,me,everyone,all,mention,mentions,example,user,users,account,accounts,official,help,helps,support,supports,info,information,informations,announce,announces,announcement,announcements,notice,notification,notifications,dev,developer,developers,tech,misskey}'`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_membership" ("userId", "userListId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_605472305f26818cc93d1baaa7" ON "user_list_membership" ("userListId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d844bfc6f3f523a05189076efa" ON "user_list_membership" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_605472305f26818cc93d1baaa74" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_d844bfc6f3f523a05189076efaa" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-}

packages/backend/migration/1696373953614-meta-cache-settings.js

@@ -1,22 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class MetaCacheSettings1696373953614 {
-    name = 'MetaCacheSettings1696373953614'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perLocalUserUserTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perRemoteUserUserTimelineCacheMax" integer NOT NULL DEFAULT '100'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perUserHomeTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perUserListTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perUserListTimelineCacheMax"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perUserHomeTimelineCacheMax"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perRemoteUserUserTimelineCacheMax"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perLocalUserUserTimelineCacheMax"`);
-    }
-}

packages/backend/migration/1696388600237-revert-note-edit.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class RevertNoteEdit1696388600237 {
-    name = 'RevertNoteEdit1696388600237'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
-    }
-}

packages/backend/migration/1696405744672-clean-up.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class CleanUp1696405744672 {
-    name = 'CleanUp1696405744672'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_e7c0567f5261063592f022e9b5"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_25dfc71b0369b003a4cd434d0b"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_25dfc71b0369b003a4cd434d0b" ON "note" ("attachedFileTypes") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e7c0567f5261063592f022e9b5" ON "note" ("createdAt") `);
-    }
-}

packages/backend/migration/1696569742153-clean-up.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class CleanUp1696569742153 {
-    name = 'CleanUp1696569742153'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_01f4581f114e0ebd2bbb876f0b"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "score"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "score" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`CREATE INDEX "IDX_01f4581f114e0ebd2bbb876f0b" ON "note_reaction" ("createdAt") `);
-    }
-}

packages/backend/migration/1696581429196-clean-up.js

@@ -1,15 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class CleanUp1696581429196 {
-    name = 'CleanUp1696581429196'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP TABLE IF EXISTS "muted_note"`);
-    }
-
-    async down(queryRunner) {
-    }
-}

packages/backend/migration/1696743032098-AdsOnStream.js

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

packages/backend/migration/1696807733453-userListUserId.js

@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class UserListUserId1696807733453 {
-    name = 'UserListUserId1696807733453'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD "userListUserId" character varying(32) NOT NULL DEFAULT ''`);
-				const memberships = await queryRunner.query(`SELECT "id", "userListId" FROM "user_list_membership"`);
-				for(let i = 0; i < memberships.length; i++) {
-					const userList = await queryRunner.query(`SELECT "userId" FROM "user_list" WHERE "id" = $1`, [memberships[i].userListId]);
-					await queryRunner.query(`UPDATE "user_list_membership" SET "userListUserId" = $1 WHERE "id" = $2`, [userList[0].userId, memberships[i].id]);
-				}
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP COLUMN "userListUserId"`);
-    }
-}

packages/backend/migration/1696808725134-userListUserId-2.js

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

packages/backend/package.json

@@ -39,7 +39,7 @@
 		"@swc/core-win32-x64-msvc": "1.3.56",
 		"@tensorflow/tfjs": "4.4.0",
 		"@tensorflow/tfjs-node": "4.4.0",
-		"bufferutil": "4.0.7",
+		"bufferutil": "^4.0.7",
 		"slacc-android-arm-eabi": "0.0.10",
 		"slacc-android-arm64": "0.0.10",
 		"slacc-darwin-arm64": "0.0.10",
@@ -53,32 +53,32 @@
 		"slacc-linux-x64-musl": "0.0.10",
 		"slacc-win32-arm64-msvc": "0.0.10",
 		"slacc-win32-x64-msvc": "0.0.10",
-		"utf-8-validate": "6.0.3"
+		"utf-8-validate": "^6.0.3"
 	},
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.412.0",
 		"@aws-sdk/lib-storage": "3.412.0",
-		"@smithy/node-http-handler": "2.1.5",
-		"@bull-board/api": "5.8.4",
-		"@bull-board/fastify": "5.8.4",
-		"@bull-board/ui": "5.8.4",
+		"@smithy/node-http-handler": "2.1.3",
+		"@bull-board/api": "5.8.3",
+		"@bull-board/fastify": "5.8.3",
+		"@bull-board/ui": "5.8.3",
 		"@discordapp/twemoji": "14.1.2",
 		"@fastify/accepts": "4.2.0",
-		"@fastify/cookie": "9.1.0",
-		"@fastify/cors": "8.4.0",
+		"@fastify/cookie": "9.0.4",
+		"@fastify/cors": "8.3.0",
 		"@fastify/express": "2.3.0",
 		"@fastify/http-proxy": "9.2.1",
-		"@fastify/multipart": "8.0.0",
-		"@fastify/static": "6.11.2",
-		"@fastify/view": "8.2.0",
-		"@nestjs/common": "10.2.7",
-		"@nestjs/core": "10.2.7",
-		"@nestjs/testing": "10.2.7",
+		"@fastify/multipart": "7.7.3",
+		"@fastify/static": "6.11.1",
+		"@fastify/view": "8.1.0",
+		"@nestjs/common": "10.2.5",
+		"@nestjs/core": "10.2.5",
+		"@nestjs/testing": "10.2.5",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "8.2.0",
+		"@simplewebauthn/server": "8.1.1",
 		"@sinonjs/fake-timers": "11.1.0",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.92",
+		"@swc/core": "1.3.84",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
@@ -86,7 +86,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.12.3",
+		"bullmq": "4.10.0",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -115,7 +115,7 @@
 		"json5": "2.2.3",
 		"jsonld": "8.3.1",
 		"jsrsasign": "10.8.6",
-		"meilisearch": "0.35.0",
+		"meilisearch": "0.34.2",
 		"mfm-js": "0.23.3",
 		"microformats-parser": "1.5.2",
 		"mime-types": "2.1.35",
@@ -124,13 +124,13 @@
 		"nanoid": "5.0.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.6",
+		"nodemailer": "6.9.5",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.11.1",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
-		"otpauth": "9.1.5",
+		"otpauth": "9.1.4",
 		"parse5": "7.1.2",
 		"pg": "8.11.3",
 		"pkce-challenge": "4.0.1",
@@ -149,16 +149,16 @@
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
 		"sanitize-html": "2.11.0",
-		"sharp": "0.32.6",
+		"sharp": "0.32.5",
 		"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.21.11",
+		"systeminformation": "5.21.5",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
-		"tsc-alias": "1.8.8",
+		"tsc-alias": "1.8.7",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.17",
@@ -166,7 +166,7 @@
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.6",
-		"ws": "8.14.2",
+		"ws": "8.14.1",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
@@ -174,49 +174,49 @@
 		"@simplewebauthn/typescript-types": "8.0.0",
 		"@swc/jest": "0.2.29",
 		"@types/accepts": "1.3.5",
-		"@types/archiver": "5.3.3",
-		"@types/bcryptjs": "2.4.4",
-		"@types/body-parser": "1.19.3",
+		"@types/archiver": "5.3.2",
+		"@types/bcryptjs": "2.4.3",
+		"@types/body-parser": "1.19.2",
 		"@types/cbor": "6.0.0",
 		"@types/color-convert": "2.0.1",
 		"@types/content-disposition": "0.5.6",
 		"@types/fluent-ffmpeg": "2.1.22",
 		"@types/http-link-header": "1.0.3",
-		"@types/jest": "29.5.5",
-		"@types/js-yaml": "4.0.6",
-		"@types/jsdom": "21.1.3",
-		"@types/jsonld": "1.5.10",
-		"@types/jsrsasign": "10.5.9",
-		"@types/mime-types": "2.1.2",
-		"@types/ms": "0.7.32",
-		"@types/node": "20.8.4",
+		"@types/jest": "29.5.4",
+		"@types/js-yaml": "4.0.5",
+		"@types/jsdom": "21.1.2",
+		"@types/jsonld": "1.5.9",
+		"@types/jsrsasign": "10.5.8",
+		"@types/mime-types": "2.1.1",
+		"@types/ms": "0.7.31",
+		"@types/node": "20.6.0",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.11",
+		"@types/nodemailer": "6.4.10",
 		"@types/oauth": "0.9.2",
 		"@types/oauth2orize": "1.11.1",
 		"@types/oauth2orize-pkce": "0.1.0",
-		"@types/pg": "8.10.4",
-		"@types/pug": "2.0.7",
+		"@types/pg": "8.10.2",
+		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
 		"@types/qrcode": "1.5.2",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
-		"@types/rename": "1.0.5",
-		"@types/sanitize-html": "2.9.1",
-		"@types/semver": "7.5.3",
+		"@types/rename": "1.0.4",
+		"@types/sanitize-html": "2.9.0",
+		"@types/semver": "7.5.2",
 		"@types/sharp": "0.32.0",
-		"@types/simple-oauth2": "5.0.5",
-		"@types/sinonjs__fake-timers": "8.1.3",
+		"@types/simple-oauth2": "5.0.4",
+		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/tinycolor2": "1.4.4",
 		"@types/tmp": "0.2.4",
-		"@types/vary": "1.1.1",
-		"@types/web-push": "3.6.1",
-		"@types/ws": "8.5.6",
-		"@typescript-eslint/eslint-plugin": "6.7.5",
-		"@typescript-eslint/parser": "6.7.5",
+		"@types/vary": "1.1.0",
+		"@types/web-push": "3.6.0",
+		"@types/ws": "8.5.5",
+		"@typescript-eslint/eslint-plugin": "6.7.0",
+		"@typescript-eslint/parser": "6.7.0",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.51.0",
+		"eslint": "8.49.0",
 		"eslint-plugin-import": "2.28.1",
 		"execa": "8.0.1",
 		"jest": "29.7.0",

packages/backend/src/GlobalModule.ts

@@ -70,19 +70,11 @@ const $redisForSub: Provider = {
 	inject: [DI.config],
 };
 
-const $redisForTimelines: Provider = {
-	provide: DI.redisForTimelines,
-	useFactory: (config: Config) => {
-		return new Redis.Redis(config.redisForTimelines);
-	},
-	inject: [DI.config],
-};
-
 @Global()
 @Module({
 	imports: [RepositoryModule],
-	providers: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines],
-	exports: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines, RepositoryModule],
+	providers: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub],
+	exports: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub, RepositoryModule],
 })
 export class GlobalModule implements OnApplicationShutdown {
 	constructor(
@@ -90,7 +82,6 @@ export class GlobalModule implements OnApplicationShutdown {
 		@Inject(DI.redis) private redisClient: Redis.Redis,
 		@Inject(DI.redisForPub) private redisForPub: Redis.Redis,
 		@Inject(DI.redisForSub) private redisForSub: Redis.Redis,
-		@Inject(DI.redisForTimelines) private redisForTimelines: Redis.Redis,
 	) {}
 
 	public async dispose(): Promise<void> {
@@ -107,7 +98,6 @@ export class GlobalModule implements OnApplicationShutdown {
 			this.redisClient.disconnect(),
 			this.redisForPub.disconnect(),
 			this.redisForSub.disconnect(),
-			this.redisForTimelines.disconnect(),
 		]);
 	}
 

packages/backend/src/boot/common.ts

@@ -17,6 +17,7 @@ export async function server() {
 	const app = await NestFactory.createApplicationContext(MainModule, {
 		logger: new NestLogger(),
 	});
+	app.enableShutdownHooks();
 
 	const serverService = app.get(ServerService);
 	await serverService.launch();
@@ -34,6 +35,7 @@ export async function jobQueue() {
 	const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
 		logger: new NestLogger(),
 	});
+	jobQueue.enableShutdownHooks();
 
 	jobQueue.get(QueueProcessorService).start();
 	jobQueue.get(ChartManagementService).start();

packages/backend/src/boot/master.ts

@@ -63,40 +63,26 @@ export async function masterMain() {
 		showNodejsVersion();
 		config = loadConfigBoot();
 		//await connectDb();
-		if (config.pidFile) fs.writeFileSync(config.pidFile, process.pid.toString());
 	} catch (e) {
 		bootLogger.error('Fatal error occurred during initialization', null, true);
 		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.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();
-		}
-
+	if (!envOption.disableClustering) {
 		await spawnWorkers(config.clusterLimit);
 	}
 
-	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);
-	}
+	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

@@ -47,7 +47,6 @@ type Source = {
 	redis: RedisOptionsSource;
 	redisForPubsub?: RedisOptionsSource;
 	redisForJobQueue?: RedisOptionsSource;
-	redisForTimelines?: RedisOptionsSource;
 	meilisearch?: {
 		host: string;
 		port: string;
@@ -86,11 +85,11 @@ type Source = {
 	videoThumbnailGenerator?: string;
 
 	signToActivityPubGet?: boolean;
+	outboxNotesFetchLimit?: number;
 
 	perChannelMaxNoteCacheCount?: number;
 	perUserNotificationsMaxCount?: number;
 	deactivateAntennaThreshold?: number;
-	pidFile: string;
 };
 
 export type Config = {
@@ -162,11 +161,9 @@ export type Config = {
 	redis: RedisOptions & RedisOptionsSource;
 	redisForPubsub: RedisOptions & RedisOptionsSource;
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
-	redisForTimelines: RedisOptions & RedisOptionsSource;
 	perChannelMaxNoteCacheCount: number;
 	perUserNotificationsMaxCount: number;
 	deactivateAntennaThreshold: number;
-	pidFile: string;
 };
 
 const _filename = fileURLToPath(import.meta.url);
@@ -229,7 +226,6 @@ export function loadConfig(): Config {
 		redis,
 		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
 		redisForJobQueue: config.redisForJobQueue ? convertRedisOptions(config.redisForJobQueue, host) : redis,
-		redisForTimelines: config.redisForTimelines ? convertRedisOptions(config.redisForTimelines, host) : redis,
 		id: config.id,
 		proxy: config.proxy,
 		proxySmtp: config.proxySmtp,
@@ -260,7 +256,6 @@ export function loadConfig(): Config {
 		perChannelMaxNoteCacheCount: config.perChannelMaxNoteCacheCount ?? 1000,
 		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 300,
 		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
-		pidFile: config.pidFile,
 	};
 }
 

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 { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
-import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListMembershipsRepository, UsersRepository } from '@/models/_.js';
+import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/entities/User.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';
@@ -42,8 +42,8 @@ export class AccountMoveService {
 		@Inject(DI.mutingsRepository)
 		private mutingsRepository: MutingsRepository,
 
-		@Inject(DI.userListMembershipsRepository)
-		private userListMembershipsRepository: UserListMembershipsRepository,
+		@Inject(DI.userListJoiningsRepository)
+		private userListJoiningsRepository: UserListJoiningsRepository,
 
 		@Inject(DI.instancesRepository)
 		private instancesRepository: InstancesRepository,
@@ -215,41 +215,40 @@ export class AccountMoveService {
 	@bindThis
 	public async updateLists(src: ThinUser, dst: MiUser): Promise<void> {
 		// Return if there is no list to be updated.
-		const oldMemberships = await this.userListMembershipsRepository.find({
+		const oldJoinings = await this.userListJoiningsRepository.find({
 			where: {
 				userId: src.id,
 			},
 		});
-		if (oldMemberships.length === 0) return;
+		if (oldJoinings.length === 0) return;
 
-		const existingUserListIds = await this.userListMembershipsRepository.find({
+		const existingUserListIds = await this.userListJoiningsRepository.find({
 			where: {
 				userId: dst.id,
 			},
-		}).then(memberships => memberships.map(membership => membership.userListId));
+		}).then(joinings => joinings.map(joining => joining.userListId));
 
-		const newMemberships: Map<string, { createdAt: Date; userId: string; userListId: string; userListUserId: string; }> = new Map();
+		const newJoinings: Map<string, { createdAt: Date; userId: string; userListId: string; }> = new Map();
 
 		// 重複しないようにIDを生成
 		const genId = (): string => {
 			let id: string;
 			do {
 				id = this.idService.genId();
-			} while (newMemberships.has(id));
+			} while (newJoinings.has(id));
 			return id;
 		};
-		for (const membership of oldMemberships) {
-			if (existingUserListIds.includes(membership.userListId)) continue; // skip if dst exists in this user's list
-			newMemberships.set(genId(), {
+		for (const joining of oldJoinings) {
+			if (existingUserListIds.includes(joining.userListId)) continue; // skip if dst exists in this user's list
+			newJoinings.set(genId(), {
 				createdAt: new Date(),
 				userId: dst.id,
-				userListId: membership.userListId,
-				userListUserId: membership.userListUserId,
+				userListId: joining.userListId,
 			});
 		}
 
-		const arrayToInsert = Array.from(newMemberships.entries()).map(entry => ({ ...entry[1], id: entry[0] }));
-		await this.userListMembershipsRepository.insert(arrayToInsert);
+		const arrayToInsert = Array.from(newJoinings.entries()).map(entry => ({ ...entry[1], id: entry[0] }));
+		await this.userListJoiningsRepository.insert(arrayToInsert);
 
 		// Have the proxy account follow the new account in the same way as UserListService.push
 		if (this.userEntityService.isRemoteUser(dst)) {

packages/backend/src/core/AccountUpdateService.ts

@@ -6,7 +6,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository } from '@/models/_.js';
-import type { MiUser } from '@/models/User.js';
+import type { MiUser } from '@/models/entities/User.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { RelayService } from '@/core/RelayService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';

packages/backend/src/core/AchievementService.ts

@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import type { UserProfilesRepository } from '@/models/_.js';
-import type { MiUser } from '@/models/User.js';
+import type { MiUser } from '@/models/entities/User.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { NotificationService } from '@/core/NotificationService.js';

packages/backend/src/core/AnnouncementService.ts

@@ -6,13 +6,12 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Brackets } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { MiUser } from '@/models/User.js';
-import type { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, MiAnnouncementRead, UsersRepository } from '@/models/_.js';
+import type { MiUser } from '@/models/entities/User.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';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 @Injectable()
 export class AnnouncementService {
@@ -23,12 +22,8 @@ export class AnnouncementService {
 		@Inject(DI.announcementReadsRepository)
 		private announcementReadsRepository: AnnouncementReadsRepository,
 
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
-		private moderationLogService: ModerationLogService,
 	) {
 	}
 
@@ -63,7 +58,7 @@ export class AnnouncementService {
 	}
 
 	@bindThis
-	public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; 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(),
@@ -84,28 +79,10 @@ export class AnnouncementService {
 			this.globalEventService.publishMainStream(values.userId, 'announcementCreated', {
 				announcement: packed,
 			});
-
-			if (moderator) {
-				const user = await this.usersRepository.findOneByOrFail({ id: values.userId });
-				this.moderationLogService.log(moderator, 'createUserAnnouncement', {
-					announcementId: announcement.id,
-					announcement: announcement,
-					userId: values.userId,
-					userUsername: user.username,
-					userHost: user.host,
-				});
-			}
 		} else {
 			this.globalEventService.publishBroadcastStream('announcementCreated', {
 				announcement: packed,
 			});
-
-			if (moderator) {
-				this.moderationLogService.log(moderator, 'createGlobalAnnouncement', {
-					announcementId: announcement.id,
-					announcement: announcement,
-				});
-			}
 		}
 
 		return {
@@ -114,67 +91,6 @@ export class AnnouncementService {
 		};
 	}
 
-	@bindThis
-	public async update(announcement: MiAnnouncement, values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<void> {
-		await this.announcementsRepository.update(announcement.id, {
-			updatedAt: new Date(),
-			title: values.title,
-			text: values.text,
-			/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 空の文字列の場合、nullを渡すようにするため */
-			imageUrl: values.imageUrl || null,
-			display: values.display,
-			icon: values.icon,
-			forExistingUsers: values.forExistingUsers,
-			needConfirmationToRead: values.needConfirmationToRead,
-			isActive: values.isActive,
-		});
-
-		const after = await this.announcementsRepository.findOneByOrFail({ id: announcement.id });
-
-		if (moderator) {
-			if (announcement.userId) {
-				const user = await this.usersRepository.findOneByOrFail({ id: announcement.userId });
-				this.moderationLogService.log(moderator, 'updateUserAnnouncement', {
-					announcementId: announcement.id,
-					before: announcement,
-					after: after,
-					userId: announcement.userId,
-					userUsername: user.username,
-					userHost: user.host,
-				});
-			} else {
-				this.moderationLogService.log(moderator, 'updateGlobalAnnouncement', {
-					announcementId: announcement.id,
-					before: announcement,
-					after: after,
-				});
-			}
-		}
-	}
-
-	@bindThis
-	public async delete(announcement: MiAnnouncement, moderator?: MiUser): Promise<void> {
-		await this.announcementsRepository.delete(announcement.id);
-
-		if (moderator) {
-			if (announcement.userId) {
-				const user = await this.usersRepository.findOneByOrFail({ id: announcement.userId });
-				this.moderationLogService.log(moderator, 'deleteUserAnnouncement', {
-					announcementId: announcement.id,
-					announcement: announcement,
-					userId: announcement.userId,
-					userUsername: user.username,
-					userHost: user.host,
-				});
-			} else {
-				this.moderationLogService.log(moderator, 'deleteGlobalAnnouncement', {
-					announcementId: announcement.id,
-					announcement: announcement,
-				});
-			}
-		}
-	}
-
 	@bindThis
 	public async read(user: MiUser, announcementId: MiAnnouncement['id']): Promise<void> {
 		try {

packages/backend/src/core/AntennaService.ts

@@ -5,18 +5,17 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { MiAntenna } from '@/models/Antenna.js';
-import type { MiNote } from '@/models/Note.js';
-import type { MiUser } from '@/models/User.js';
+import type { MiAntenna } from '@/models/entities/Antenna.js';
+import type { MiNote } from '@/models/entities/Note.js';
+import type { MiUser } from '@/models/entities/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, UserListMembershipsRepository } from '@/models/_.js';
+import type { AntennasRepository, UserListJoiningsRepository } from '@/models/_.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { RedisTimelineService } from '@/core/RedisTimelineService.js';
+import { StreamMessages } from '@/server/api/stream/types.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -25,8 +24,8 @@ export class AntennaService implements OnApplicationShutdown {
 	private antennas: MiAntenna[];
 
 	constructor(
-		@Inject(DI.redisForTimelines)
-		private redisForTimelines: Redis.Redis,
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
 
 		@Inject(DI.redisForSub)
 		private redisForSub: Redis.Redis,
@@ -34,12 +33,11 @@ export class AntennaService implements OnApplicationShutdown {
 		@Inject(DI.antennasRepository)
 		private antennasRepository: AntennasRepository,
 
-		@Inject(DI.userListMembershipsRepository)
-		private userListMembershipsRepository: UserListMembershipsRepository,
+		@Inject(DI.userListJoiningsRepository)
+		private userListJoiningsRepository: UserListJoiningsRepository,
 
 		private utilityService: UtilityService,
 		private globalEventService: GlobalEventService,
-		private redisTimelineService: RedisTimelineService,
 	) {
 		this.antennasFetched = false;
 		this.antennas = [];
@@ -52,7 +50,7 @@ export class AntennaService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'antennaCreated':
 					this.antennas.push({
@@ -83,10 +81,15 @@ export class AntennaService implements OnApplicationShutdown {
 		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);
 
-		const redisPipeline = this.redisForTimelines.pipeline();
+		const redisPipeline = this.redisClient.pipeline();
 
 		for (const antenna of matchedAntennas) {
-			this.redisTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
+			redisPipeline.xadd(
+				`antennaTimeline:${antenna.id}`,
+				'MAXLEN', '~', '200',
+				'*',
+				'note', note.id);
+
 			this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 		}
 
@@ -105,7 +108,7 @@ export class AntennaService implements OnApplicationShutdown {
 		if (antenna.src === 'home') {
 			// TODO
 		} else if (antenna.src === 'list') {
-			const listUsers = (await this.userListMembershipsRepository.findBy({
+			const listUsers = (await this.userListJoiningsRepository.findBy({
 				userListId: antenna.userListId!,
 			})).map(x => x.userId);
 
@@ -116,12 +119,6 @@ export class AntennaService implements OnApplicationShutdown {
 				return this.utilityService.getFullApAccount(username, host).toLowerCase();
 			});
 			if (!accts.includes(this.utilityService.getFullApAccount(noteUser.username, noteUser.host).toLowerCase())) return false;
-		} else if (antenna.src === 'users_blacklist') {
-			const accts = antenna.users.map(x => {
-				const { username, host } = Acct.parse(x);
-				return this.utilityService.getFullApAccount(username, host).toLowerCase();
-			});
-			if (accts.includes(this.utilityService.getFullApAccount(noteUser.username, noteUser.host).toLowerCase())) return false;
 		}
 
 		const keywords = antenna.keywords

packages/backend/src/core/CacheService.ts

@@ -5,13 +5,13 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js';
+import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository } from '@/models/_.js';
 import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
-import type { MiLocalUser, MiUser } from '@/models/User.js';
+import type { MiLocalUser, MiUser } from '@/models/entities/User.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { StreamMessages } from '@/server/api/stream/types.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -25,7 +25,7 @@ export class CacheService implements OnApplicationShutdown {
 	public userBlockingCache: RedisKVCache<Set<string>>;
 	public userBlockedCache: RedisKVCache<Set<string>>; // NOTE: 「被」Blockキャッシュ
 	public renoteMutingsCache: RedisKVCache<Set<string>>;
-	public userFollowingsCache: RedisKVCache<Record<string, Pick<MiFollowing, 'withReplies'> | undefined>>;
+	public userFollowingsCache: RedisKVCache<Set<string>>;
 	public userFollowingChannelsCache: RedisKVCache<Set<string>>;
 
 	constructor(
@@ -136,18 +136,12 @@ export class CacheService implements OnApplicationShutdown {
 			fromRedisConverter: (value) => new Set(JSON.parse(value)),
 		});
 
-		this.userFollowingsCache = new RedisKVCache<Record<string, Pick<MiFollowing, 'withReplies'> | undefined>>(this.redisClient, 'userFollowings', {
+		this.userFollowingsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowings', {
 			lifetime: 1000 * 60 * 30, // 30m
 			memoryCacheLifetime: 1000 * 60, // 1m
-			fetcher: (key) => this.followingsRepository.find({ where: { followerId: key }, select: ['followeeId', 'withReplies'] }).then(xs => {
-				const obj: Record<string, Pick<MiFollowing, 'withReplies'> | undefined> = {};
-				for (const x of xs) {
-					obj[x.followeeId] = { withReplies: x.withReplies };
-				}
-				return obj;
-			}),
-			toRedisConverter: (value) => JSON.stringify(value),
-			fromRedisConverter: (value) => JSON.parse(value),
+			fetcher: (key) => this.followingsRepository.find({ where: { followerId: key }, select: ['followeeId'] }).then(xs => new Set(xs.map(x => x.followeeId))),
+			toRedisConverter: (value) => JSON.stringify(Array.from(value)),
+			fromRedisConverter: (value) => new Set(JSON.parse(value)),
 		});
 
 		this.userFollowingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowingChannels', {
@@ -166,7 +160,7 @@ export class CacheService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'userChangeSuspendedState':
 				case 'remoteUserUpdated': {
@@ -194,7 +188,6 @@ export class CacheService implements OnApplicationShutdown {
 					if (follower) follower.followingCount++;
 					const followee = this.userByIdCache.get(body.followeeId);
 					if (followee) followee.followersCount++;
-					this.userFollowingsCache.delete(body.followerId);
 					break;
 				}
 				default:

packages/backend/src/core/ClipService.ts

@@ -1,159 +0,0 @@
-/*
- * 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

@@ -46,22 +46,17 @@ import { SignupService } from './SignupService.js';
 import { WebAuthnService } from './WebAuthnService.js';
 import { UserBlockingService } from './UserBlockingService.js';
 import { CacheService } from './CacheService.js';
-import { UserService } from './UserService.js';
 import { UserFollowingService } from './UserFollowingService.js';
 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 { FeaturedService } from './FeaturedService.js';
-import { RedisTimelineService } from './RedisTimelineService.js';
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
 import NotesChart from './chart/charts/notes.js';
@@ -176,21 +171,16 @@ const $SignupService: Provider = { provide: 'SignupService', useExisting: Signup
 const $WebAuthnService: Provider = { provide: 'WebAuthnService', useExisting: WebAuthnService };
 const $UserBlockingService: Provider = { provide: 'UserBlockingService', useExisting: UserBlockingService };
 const $CacheService: Provider = { provide: 'CacheService', useExisting: CacheService };
-const $UserService: Provider = { provide: 'UserService', useExisting: UserService };
 const $UserFollowingService: Provider = { provide: 'UserFollowingService', useExisting: UserFollowingService };
 const $UserKeypairService: Provider = { provide: 'UserKeypairService', useExisting: UserKeypairService };
 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 $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
-const $RedisTimelineService: Provider = { provide: 'RedisTimelineService', useExisting: RedisTimelineService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -309,21 +299,16 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		WebAuthnService,
 		UserBlockingService,
 		CacheService,
-		UserService,
 		UserFollowingService,
 		UserKeypairService,
 		UserListService,
 		UserMutingService,
 		UserSuspendService,
-		UserAuthService,
 		VideoProcessingService,
 		WebhookService,
 		UtilityService,
 		FileInfoService,
 		SearchService,
-		ClipService,
-		FeaturedService,
-		RedisTimelineService,
 		ChartLoggerService,
 		FederationChart,
 		NotesChart,
@@ -435,21 +420,16 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$WebAuthnService,
 		$UserBlockingService,
 		$CacheService,
-		$UserService,
 		$UserFollowingService,
 		$UserKeypairService,
 		$UserListService,
 		$UserMutingService,
 		$UserSuspendService,
-		$UserAuthService,
 		$VideoProcessingService,
 		$WebhookService,
 		$UtilityService,
 		$FileInfoService,
 		$SearchService,
-		$ClipService,
-		$FeaturedService,
-		$RedisTimelineService,
 		$ChartLoggerService,
 		$FederationChart,
 		$NotesChart,
@@ -562,21 +542,16 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		WebAuthnService,
 		UserBlockingService,
 		CacheService,
-		UserService,
 		UserFollowingService,
 		UserKeypairService,
 		UserListService,
 		UserMutingService,
 		UserSuspendService,
-		UserAuthService,
 		VideoProcessingService,
 		WebhookService,
 		UtilityService,
 		FileInfoService,
 		SearchService,
-		ClipService,
-		FeaturedService,
-		RedisTimelineService,
 		FederationChart,
 		NotesChart,
 		UsersChart,
@@ -687,21 +662,16 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$WebAuthnService,
 		$UserBlockingService,
 		$CacheService,
-		$UserService,
 		$UserFollowingService,
 		$UserKeypairService,
 		$UserListService,
 		$UserMutingService,
 		$UserSuspendService,
-		$UserAuthService,
 		$VideoProcessingService,
 		$WebhookService,
 		$UtilityService,
 		$FileInfoService,
 		$SearchService,
-		$ClipService,
-		$FeaturedService,
-		$RedisTimelineService,
 		$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 { MiUser } from '@/models/User.js';
-import { MiUserProfile } from '@/models/UserProfile.js';
+import { MiUser } from '@/models/entities/User.js';
+import { MiUserProfile } from '@/models/entities/UserProfile.js';
 import { IdService } from '@/core/IdService.js';
-import { MiUserKeypair } from '@/models/UserKeypair.js';
-import { MiUsedUsername } from '@/models/UsedUsername.js';
+import { MiUserKeypair } from '@/models/entities/UserKeypair.js';
+import { MiUsedUsername } from '@/models/entities/UsedUsername.js';
 import { DI } from '@/di-symbols.js';
 import generateNativeUserToken from '@/misc/generate-native-user-token.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/CustomEmojiService.ts

@@ -10,15 +10,14 @@ 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 { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiEmoji } from '@/models/Emoji.js';
-import type { EmojisRepository, MiRole, MiUser } from '@/models/_.js';
+import type { MiDriveFile } from '@/models/entities/DriveFile.js';
+import type { MiEmoji } from '@/models/entities/Emoji.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';
 import { query } from '@/misc/prelude/url.js';
-import type { Serialized } from '@/types.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
+import type { Serialized } from '@/server/api/stream/types.js';
 
 const parseEmojiStrRegexp = /^(\w+)(?:@([\w.-]+))?$/;
 
@@ -37,7 +36,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		private utilityService: UtilityService,
 		private idService: IdService,
 		private emojiEntityService: EmojiEntityService,
-		private moderationLogService: ModerationLogService,
 		private globalEventService: GlobalEventService,
 	) {
 		this.cache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12);
@@ -48,6 +46,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			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<MiEmoji>) => [x.name, {
 					...x,
 					updatedAt: x.updatedAt ? new Date(x.updatedAt) : null,
@@ -67,7 +66,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		isSensitive: boolean;
 		localOnly: boolean;
 		roleIdsThatCanBeUsedThisEmojiAsReaction: MiRole['id'][];
-	}, moderator?: MiUser): Promise<MiEmoji> {
+	}): Promise<MiEmoji> {
 		const emoji = await this.emojisRepository.insert({
 			id: this.idService.genId(),
 			updatedAt: new Date(),
@@ -90,13 +89,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			this.globalEventService.publishBroadcastStream('emojiAdded', {
 				emoji: await this.emojiEntityService.packDetailed(emoji.id),
 			});
-
-			if (moderator) {
-				this.moderationLogService.log(moderator, 'addCustomEmoji', {
-					emojiId: emoji.id,
-					emoji: emoji,
-				});
-			}
 		}
 
 		return emoji;
@@ -112,7 +104,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		isSensitive?: boolean;
 		localOnly?: boolean;
 		roleIdsThatCanBeUsedThisEmojiAsReaction?: MiRole['id'][];
-	}, moderator?: MiUser): Promise<void> {
+	}): Promise<void> {
 		const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
 		const sameNameEmoji = await this.emojisRepository.findOneBy({ name: data.name, host: IsNull() });
 		if (sameNameEmoji != null && sameNameEmoji.id !== id) throw new Error('name already exists');
@@ -133,11 +125,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 		this.localEmojisCache.refresh();
 
-		const packed = await this.emojiEntityService.packDetailed(emoji.id);
+		const updated = await this.emojiEntityService.packDetailed(emoji.id);
 
 		if (emoji.name === data.name) {
 			this.globalEventService.publishBroadcastStream('emojiUpdated', {
-				emojis: [packed],
+				emojis: [updated],
 			});
 		} else {
 			this.globalEventService.publishBroadcastStream('emojiDeleted', {
@@ -145,16 +137,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			});
 
 			this.globalEventService.publishBroadcastStream('emojiAdded', {
-				emoji: packed,
-			});
-		}
-
-		if (moderator) {
-			const updated = await this.emojisRepository.findOneByOrFail({ id: id });
-			this.moderationLogService.log(moderator, 'updateCustomEmoji', {
-				emojiId: emoji.id,
-				before: emoji,
-				after: updated,
+				emoji: updated,
 			});
 		}
 	}
@@ -248,7 +231,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async delete(id: MiEmoji['id'], moderator?: MiUser) {
+	public async delete(id: MiEmoji['id']) {
 		const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
 
 		await this.emojisRepository.delete(emoji.id);
@@ -258,30 +241,16 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		this.globalEventService.publishBroadcastStream('emojiDeleted', {
 			emojis: [await this.emojiEntityService.packDetailed(emoji)],
 		});
-
-		if (moderator) {
-			this.moderationLogService.log(moderator, 'deleteCustomEmoji', {
-				emojiId: emoji.id,
-				emoji: emoji,
-			});
-		}
 	}
 
 	@bindThis
-	public async deleteBulk(ids: MiEmoji['id'][], moderator?: MiUser) {
+	public async deleteBulk(ids: MiEmoji['id'][]) {
 		const emojis = await this.emojisRepository.findBy({
 			id: In(ids),
 		});
 
 		for (const emoji of emojis) {
 			await this.emojisRepository.delete(emoji.id);
-
-			if (moderator) {
-				this.moderationLogService.log(moderator, 'deleteCustomEmoji', {
-					emojiId: emoji.id,
-					emoji: emoji,
-				});
-			}
 		}
 
 		this.localEmojisCache.refresh();
@@ -379,20 +348,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		}
 	}
 
-	/**
-	 * ローカル内の絵文字に重複がないかチェックします
-	 * @param name 絵文字名
-	 */
-	@bindThis
-	public checkDuplicate(name: string): Promise<boolean> {
-		return this.emojisRepository.exist({ where: { name, host: IsNull() } });
-	}
-
-	@bindThis
-	public getEmojiById(id: string): Promise<MiEmoji | null> {
-		return this.emojisRepository.findOneBy({ id });
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.cache.dispose();

packages/backend/src/core/DriveService.ts

@@ -14,9 +14,9 @@ import { DI } from '@/di-symbols.js';
 import type { DriveFilesRepository, UsersRepository, DriveFoldersRepository, UserProfilesRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import Logger from '@/logger.js';
-import type { MiRemoteUser, MiUser } from '@/models/User.js';
+import type { MiRemoteUser, MiUser } from '@/models/entities/User.js';
 import { MetaService } from '@/core/MetaService.js';
-import { MiDriveFile } from '@/models/DriveFile.js';
+import { MiDriveFile } from '@/models/entities/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 { MiDriveFolder } from '@/models/DriveFolder.js';
+import type { MiDriveFolder } from '@/models/entities/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';
@@ -42,7 +42,6 @@ import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { correctFilename } from '@/misc/correct-filename.js';
 import { isMimeImage } from '@/misc/is-mime-image.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 type AddFileArgs = {
 	/** User who wish to add file */
@@ -87,9 +86,6 @@ type UploadFromUrlArgs = {
 
 @Injectable()
 export class DriveService {
-	public static NoSuchFolderError = class extends Error {};
-	public static InvalidFileNameError = class extends Error {};
-	public static CannotUnmarkSensitiveError = class extends Error {};
 	private registerLogger: Logger;
 	private downloaderLogger: Logger;
 	private deleteLogger: Logger;
@@ -123,7 +119,6 @@ export class DriveService {
 		private globalEventService: GlobalEventService,
 		private queueService: QueueService,
 		private roleService: RoleService,
-		private moderationLogService: ModerationLogService,
 		private driveChart: DriveChart,
 		private perUserDriveChart: PerUserDriveChart,
 		private instanceChart: InstanceChart,
@@ -653,63 +648,7 @@ export class DriveService {
 	}
 
 	@bindThis
-	public async updateFile(file: MiDriveFile, values: Partial<MiDriveFile>, updater: MiUser) {
-		const alwaysMarkNsfw = (await this.roleService.getUserPolicies(file.userId)).alwaysMarkNsfw;
-
-		if (values.name && !this.driveFileEntityService.validateFileName(file.name)) {
-			throw new DriveService.InvalidFileNameError();
-		}
-
-		if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive && alwaysMarkNsfw && !values.isSensitive) {
-			throw new DriveService.CannotUnmarkSensitiveError();
-		}
-
-		if (values.folderId != null) {
-			const folder = await this.driveFoldersRepository.findOneBy({
-				id: values.folderId,
-				userId: file.userId!,
-			});
-
-			if (folder == null) {
-				throw new DriveService.NoSuchFolderError();
-			}
-		}
-
-		await this.driveFilesRepository.update(file.id, values);
-
-		const fileObj = await this.driveFileEntityService.pack(file.id, { self: true });
-
-		// Publish fileUpdated event
-		if (file.userId) {
-			this.globalEventService.publishDriveStream(file.userId, 'fileUpdated', fileObj);
-		}
-
-		if (await this.roleService.isModerator(updater) && (file.userId !== updater.id)) {
-			if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive) {
-				const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
-				if (values.isSensitive) {
-					this.moderationLogService.log(updater, 'markSensitiveDriveFile', {
-						fileId: file.id,
-						fileUserId: file.userId,
-						fileUserUsername: user?.username ?? null,
-						fileUserHost: user?.host ?? null,
-					});
-				} else {
-					this.moderationLogService.log(updater, 'unmarkSensitiveDriveFile', {
-						fileId: file.id,
-						fileUserId: file.userId,
-						fileUserUsername: user?.username ?? null,
-						fileUserHost: user?.host ?? null,
-					});
-				}
-			}
-		}
-
-		return fileObj;
-	}
-
-	@bindThis
-	public async deleteFile(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
+	public async deleteFile(file: MiDriveFile, isExpired = false) {
 		if (file.storedInternal) {
 			this.internalStorageService.del(file.accessKey!);
 
@@ -732,11 +671,11 @@ export class DriveService {
 			}
 		}
 
-		this.deletePostProcess(file, isExpired, deleter);
+		this.deletePostProcess(file, isExpired);
 	}
 
 	@bindThis
-	public async deleteFileSync(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
+	public async deleteFileSync(file: MiDriveFile, isExpired = false) {
 		if (file.storedInternal) {
 			this.internalStorageService.del(file.accessKey!);
 
@@ -763,11 +702,11 @@ export class DriveService {
 			await Promise.all(promises);
 		}
 
-		this.deletePostProcess(file, isExpired, deleter);
+		this.deletePostProcess(file, isExpired);
 	}
 
 	@bindThis
-	private async deletePostProcess(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
+	private async deletePostProcess(file: MiDriveFile, isExpired = false) {
 		// リモートファイル期限切れ削除後は直リンクにする
 		if (isExpired && file.userHost !== null && file.uri != null) {
 			this.driveFilesRepository.update(file.id, {
@@ -794,20 +733,6 @@ export class DriveService {
 				this.instanceChart.updateDrive(file, false);
 			}
 		}
-
-		if (file.userId) {
-			this.globalEventService.publishDriveStream(file.userId, 'fileDeleted', file.id);
-		}
-
-		if (deleter && await this.roleService.isModerator(deleter) && (file.userId !== deleter.id)) {
-			const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
-			this.moderationLogService.log(deleter, 'deleteDriveFile', {
-				fileId: file.id,
-				fileUserId: file.userId,
-				fileUserUsername: user?.username ?? null,
-				fileUserHost: user?.host ?? null,
-			});
-		}
 	}
 
 	@bindThis

packages/backend/src/core/FeaturedService.ts

@@ -1,116 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
-import type { MiNote, MiUser } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
-
-const GLOBAL_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと
-const PER_USER_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 7; // 1週間ごと
-const HASHTAG_RANKING_WINDOW = 1000 * 60 * 60; // 1時間ごと
-
-@Injectable()
-export class FeaturedService {
-	constructor(
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis, // TODO: 専用のRedisサーバーを設定できるようにする
-	) {
-	}
-
-	@bindThis
-	private getCurrentWindow(windowRange: number): number {
-		const passed = new Date().getTime() - new Date(new Date().getFullYear(), 0, 1).getTime();
-		return Math.floor(passed / windowRange);
-	}
-
-	@bindThis
-	private async updateRankingOf(name: string, windowRange: number, element: string, score = 1): Promise<void> {
-		const currentWindow = this.getCurrentWindow(windowRange);
-		const redisTransaction = this.redisClient.multi();
-		redisTransaction.zincrby(
-			`${name}:${currentWindow}`,
-			score,
-			element);
-		redisTransaction.expire(
-			`${name}:${currentWindow}`,
-			(windowRange * 3) / 1000,
-			'NX'); // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
-		await redisTransaction.exec();
-	}
-
-	@bindThis
-	private async getRankingOf(name: string, windowRange: number, threshold: number): Promise<string[]> {
-		const currentWindow = this.getCurrentWindow(windowRange);
-		const previousWindow = currentWindow - 1;
-
-		const redisPipeline = this.redisClient.pipeline();
-		redisPipeline.zrange(
-			`${name}:${currentWindow}`, 0, threshold, 'REV', 'WITHSCORES');
-		redisPipeline.zrange(
-			`${name}:${previousWindow}`, 0, threshold, 'REV', 'WITHSCORES');
-		const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => r[1] as string[]) : [[], []]);
-
-		const ranking = new Map<string, number>();
-		for (let i = 0; i < currentRankingResult.length; i += 2) {
-			const noteId = currentRankingResult[i];
-			const score = parseInt(currentRankingResult[i + 1], 10);
-			ranking.set(noteId, score);
-		}
-		for (let i = 0; i < previousRankingResult.length; i += 2) {
-			const noteId = previousRankingResult[i];
-			const score = parseInt(previousRankingResult[i + 1], 10);
-			const exist = ranking.get(noteId);
-			if (exist != null) {
-				ranking.set(noteId, (exist + score) / 2);
-			} else {
-				ranking.set(noteId, score);
-			}
-		}
-
-		return Array.from(ranking.keys());
-	}
-
-	@bindThis
-	public updateGlobalNotesRanking(noteId: MiNote['id'], score = 1): Promise<void> {
-		return this.updateRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
-	}
-
-	@bindThis
-	public updateInChannelNotesRanking(channelId: MiNote['channelId'], noteId: MiNote['id'], score = 1): Promise<void> {
-		return this.updateRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
-	}
-
-	@bindThis
-	public updatePerUserNotesRanking(userId: MiUser['id'], noteId: MiNote['id'], score = 1): Promise<void> {
-		return this.updateRankingOf(`featuredPerUserNotesRanking:${userId}`, PER_USER_NOTES_RANKING_WINDOW, noteId, score);
-	}
-
-	@bindThis
-	public updateHashtagsRanking(hashtag: string, score = 1): Promise<void> {
-		return this.updateRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, hashtag, score);
-	}
-
-	@bindThis
-	public getGlobalNotesRanking(threshold: number): Promise<MiNote['id'][]> {
-		return this.getRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, threshold);
-	}
-
-	@bindThis
-	public getInChannelNotesRanking(channelId: MiNote['channelId'], threshold: number): Promise<MiNote['id'][]> {
-		return this.getRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, threshold);
-	}
-
-	@bindThis
-	public getPerUserNotesRanking(userId: MiUser['id'], threshold: number): Promise<MiNote['id'][]> {
-		return this.getRankingOf(`featuredPerUserNotesRanking:${userId}`, PER_USER_NOTES_RANKING_WINDOW, threshold);
-	}
-
-	@bindThis
-	public getHashtagsRanking(threshold: number): Promise<string[]> {
-		return this.getRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, threshold);
-	}
-}

packages/backend/src/core/FederatedInstanceService.ts

@@ -6,7 +6,7 @@
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import type { InstancesRepository } from '@/models/_.js';
-import type { MiInstance } from '@/models/Instance.js';
+import type { MiInstance } from '@/models/entities/Instance.js';
 import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
 import { IdService } from '@/core/IdService.js';
 import { DI } from '@/di-symbols.js';

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 { MiInstance } from '@/models/Instance.js';
+import type { MiInstance } from '@/models/entities/Instance.js';
 import type Logger from '@/logger.js';
 import { DI } from '@/di-symbols.js';
 import { LoggerService } from '@/core/LoggerService.js';

packages/backend/src/core/GlobalEventService.ts

@@ -5,254 +5,27 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { MiChannel } from '@/models/Channel.js';
-import type { MiUser } from '@/models/User.js';
-import type { MiUserProfile } from '@/models/UserProfile.js';
-import type { MiNote } from '@/models/Note.js';
-import type { MiAntenna } from '@/models/Antenna.js';
-import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiDriveFolder } from '@/models/DriveFolder.js';
-import type { MiUserList } from '@/models/UserList.js';
-import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
-import type { MiSignin } from '@/models/Signin.js';
-import type { MiPage } from '@/models/Page.js';
-import type { MiWebhook } from '@/models/Webhook.js';
-import type { MiMeta } from '@/models/Meta.js';
-import { MiRole, MiRoleAssignment } from '@/models/_.js';
+import type { MiUser } from '@/models/entities/User.js';
+import type { MiNote } from '@/models/entities/Note.js';
+import type { MiUserList } from '@/models/entities/UserList.js';
+import type { MiAntenna } from '@/models/entities/Antenna.js';
+import type {
+	StreamChannels,
+	AdminStreamTypes,
+	AntennaStreamTypes,
+	BroadcastTypes,
+	DriveStreamTypes,
+	InternalStreamTypes,
+	MainStreamTypes,
+	NoteStreamTypes,
+	UserListStreamTypes,
+	RoleTimelineStreamTypes,
+} from '@/server/api/stream/types.js';
 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 { Serialized } from '@/types.js';
-import type Emitter from 'strict-event-emitter-types';
-import type { EventEmitter } from 'events';
-
-//#region Stream type-body definitions
-export interface BroadcastTypes {
-	emojiAdded: {
-		emoji: Packed<'EmojiDetailed'>;
-	};
-	emojiUpdated: {
-		emojis: Packed<'EmojiDetailed'>[];
-	};
-	emojiDeleted: {
-		emojis: {
-			id?: string;
-			name: string;
-			[other: string]: any;
-		}[];
-	};
-	announcementCreated: {
-		announcement: Packed<'Announcement'>;
-	};
-}
-
-export interface MainEventTypes {
-	notification: Packed<'Notification'>;
-	mention: Packed<'Note'>;
-	reply: Packed<'Note'>;
-	renote: Packed<'Note'>;
-	follow: Packed<'UserDetailedNotMe'>;
-	followed: Packed<'User'>;
-	unfollow: Packed<'User'>;
-	meUpdated: Packed<'User'>;
-	pageEvent: {
-		pageId: MiPage['id'];
-		event: string;
-		var: any;
-		userId: MiUser['id'];
-		user: Packed<'User'>;
-	};
-	urlUploadFinished: {
-		marker?: string | null;
-		file: Packed<'DriveFile'>;
-	};
-	readAllNotifications: undefined;
-	unreadNotification: Packed<'Notification'>;
-	unreadMention: MiNote['id'];
-	readAllUnreadMentions: undefined;
-	unreadSpecifiedNote: MiNote['id'];
-	readAllUnreadSpecifiedNotes: undefined;
-	readAllAntennas: undefined;
-	unreadAntenna: MiAntenna;
-	readAllAnnouncements: undefined;
-	myTokenRegenerated: undefined;
-	signin: MiSignin;
-	registryUpdated: {
-		scope?: string[];
-		key: string;
-		value: any | null;
-	};
-	driveFileCreated: Packed<'DriveFile'>;
-	readAntenna: MiAntenna;
-	receiveFollowRequest: Packed<'User'>;
-	announcementCreated: {
-		announcement: Packed<'Announcement'>;
-	};
-}
-
-export interface DriveEventTypes {
-	fileCreated: Packed<'DriveFile'>;
-	fileDeleted: MiDriveFile['id'];
-	fileUpdated: Packed<'DriveFile'>;
-	folderCreated: Packed<'DriveFolder'>;
-	folderDeleted: MiDriveFolder['id'];
-	folderUpdated: Packed<'DriveFolder'>;
-}
-
-export interface NoteEventTypes {
-	pollVoted: {
-		choice: number;
-		userId: MiUser['id'];
-	};
-	deleted: {
-		deletedAt: Date;
-	};
-	updated: {
-		cw: string | null;
-		text: string;
-	};
-	reacted: {
-		reaction: string;
-		emoji?: {
-			name: string;
-			url: string;
-		} | null;
-		userId: MiUser['id'];
-	};
-	unreacted: {
-		reaction: string;
-		userId: MiUser['id'];
-	};
-}
-type NoteStreamEventTypes = {
-	[key in keyof NoteEventTypes]: {
-		id: MiNote['id'];
-		body: NoteEventTypes[key];
-	};
-};
-
-export interface UserListEventTypes {
-	userAdded: Packed<'User'>;
-	userRemoved: Packed<'User'>;
-}
-
-export interface AntennaEventTypes {
-	note: MiNote;
-}
-
-export interface RoleTimelineEventTypes {
-	note: Packed<'Note'>;
-}
-
-export interface AdminEventTypes {
-	newAbuseUserReport: {
-		id: MiAbuseUserReport['id'];
-		targetUserId: MiUser['id'],
-		reporterId: MiUser['id'],
-		comment: string;
-	};
-}
-//#endregion
-
-// 辞書(interface or type)から{ type, body }ユニオンを定義
-// https://stackoverflow.com/questions/49311989/can-i-infer-the-type-of-a-value-using-extends-keyof-type
-// VS Codeの展開を防止するためにEvents型を定義
-type Events<T extends object> = { [K in keyof T]: { type: K; body: T[K]; } };
-type EventUnionFromDictionary<
-	T extends object,
-	U = Events<T>
-> = U[keyof U];
-
-type SerializedAll<T> = {
-	[K in keyof T]: Serialized<T[K]>;
-};
-
-export interface InternalEventTypes {
-	userChangeSuspendedState: { id: MiUser['id']; isSuspended: MiUser['isSuspended']; };
-	userTokenRegenerated: { id: MiUser['id']; oldToken: string; newToken: string; };
-	remoteUserUpdated: { id: MiUser['id']; };
-	follow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
-	unfollow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
-	blockingCreated: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
-	blockingDeleted: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
-	policiesUpdated: MiRole['policies'];
-	roleCreated: MiRole;
-	roleDeleted: MiRole;
-	roleUpdated: MiRole;
-	userRoleAssigned: MiRoleAssignment;
-	userRoleUnassigned: MiRoleAssignment;
-	webhookCreated: MiWebhook;
-	webhookDeleted: MiWebhook;
-	webhookUpdated: MiWebhook;
-	antennaCreated: MiAntenna;
-	antennaDeleted: MiAntenna;
-	antennaUpdated: MiAntenna;
-	metaUpdated: MiMeta;
-	followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
-	unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
-	updateUserProfile: MiUserProfile;
-	mute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
-	unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
-	userListMemberAdded: { userListId: MiUserList['id']; memberId: MiUser['id']; };
-	userListMemberRemoved: { userListId: MiUserList['id']; memberId: MiUser['id']; };
-}
-
-// name/messages(spec) pairs dictionary
-export type GlobalEvents = {
-	internal: {
-		name: 'internal';
-		payload: EventUnionFromDictionary<SerializedAll<InternalEventTypes>>;
-	};
-	broadcast: {
-		name: 'broadcast';
-		payload: EventUnionFromDictionary<SerializedAll<BroadcastTypes>>;
-	};
-	main: {
-		name: `mainStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<MainEventTypes>>;
-	};
-	drive: {
-		name: `driveStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<DriveEventTypes>>;
-	};
-	note: {
-		name: `noteStream:${MiNote['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<NoteStreamEventTypes>>;
-	};
-	userList: {
-		name: `userListStream:${MiUserList['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<UserListEventTypes>>;
-	};
-	roleTimeline: {
-		name: `roleTimelineStream:${MiRole['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<RoleTimelineEventTypes>>;
-	};
-	antenna: {
-		name: `antennaStream:${MiAntenna['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<AntennaEventTypes>>;
-	};
-	admin: {
-		name: `adminStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<AdminEventTypes>>;
-	};
-	notes: {
-		name: 'notesStream';
-		payload: Serialized<Packed<'Note'>>;
-	};
-};
-
-// API event definitions
-// ストリームごとのEmitterの辞書を用意
-type EventEmitterDictionary = { [x in keyof GlobalEvents]: Emitter.default<EventEmitter, { [y in GlobalEvents[x]['name']]: (e: GlobalEvents[x]['payload']) => void }> };
-// 共用体型を交差型にする型 https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
-// Emitter辞書から共用体型を作り、UnionToIntersectionで交差型にする
-export type StreamEventEmitter = UnionToIntersection<EventEmitterDictionary[keyof GlobalEvents]>;
-// { [y in name]: (e: spec) => void }をまとめてその交差型をEmitterにかけるとts(2590)にひっかかる
-
-// provide stream channels union
-export type StreamChannels = GlobalEvents[keyof GlobalEvents]['name'];
+import { MiRole } from '@/models/_.js';
 
 @Injectable()
 export class GlobalEventService {
@@ -278,7 +51,7 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishInternalEvent<K extends keyof InternalEventTypes>(type: K, value?: InternalEventTypes[K]): void {
+	public publishInternalEvent<K extends keyof InternalStreamTypes>(type: K, value?: InternalStreamTypes[K]): void {
 		this.publish('internal', type, typeof value === 'undefined' ? null : value);
 	}
 
@@ -288,17 +61,17 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishMainStream<K extends keyof MainEventTypes>(userId: MiUser['id'], type: K, value?: MainEventTypes[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 DriveEventTypes>(userId: MiUser['id'], type: K, value?: DriveEventTypes[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 NoteEventTypes>(noteId: MiNote['id'], type: K, value?: NoteEventTypes[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,
@@ -306,17 +79,17 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishUserListStream<K extends keyof UserListEventTypes>(listId: MiUserList['id'], type: K, value?: UserListEventTypes[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 AntennaEventTypes>(antennaId: MiAntenna['id'], type: K, value?: AntennaEventTypes[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 RoleTimelineEventTypes>(roleId: MiRole['id'], type: K, value?: RoleTimelineEventTypes[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);
 	}
 
@@ -326,7 +99,7 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishAdminStream<K extends keyof AdminEventTypes>(userId: MiUser['id'], type: K, value?: AdminEventTypes[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

@@ -4,31 +4,23 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
-import type { MiUser } from '@/models/User.js';
+import type { MiUser } from '@/models/entities/User.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { IdService } from '@/core/IdService.js';
-import type { MiHashtag } from '@/models/Hashtag.js';
+import type { MiHashtag } from '@/models/entities/Hashtag.js';
 import type { HashtagsRepository } from '@/models/_.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { FeaturedService } from '@/core/FeaturedService.js';
-import { MetaService } from '@/core/MetaService.js';
 
 @Injectable()
 export class HashtagService {
 	constructor(
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis, // TODO: 専用のRedisサーバーを設定できるようにする
-
 		@Inject(DI.hashtagsRepository)
 		private hashtagsRepository: HashtagsRepository,
 
 		private userEntityService: UserEntityService,
-		private featuredService: FeaturedService,
 		private idService: IdService,
-		private metaService: MetaService,
 	) {
 	}
 
@@ -54,9 +46,6 @@ export class HashtagService {
 	public async updateHashtag(user: { id: MiUser['id']; host: MiUser['host']; }, tag: string, isUserAttached = false, inc = true) {
 		tag = normalizeForSearch(tag);
 
-		// TODO: サンプリング
-		this.updateHashtagsRanking(tag, user.id);
-
 		const index = await this.hashtagsRepository.findOneBy({ name: tag });
 
 		if (index == null && !inc) return;
@@ -96,7 +85,7 @@ export class HashtagService {
 					}
 				}
 			} else {
-				// 自分が初めてこのタグを使ったなら
+			// 自分が初めてこのタグを使ったなら
 				if (!index.mentionedUserIds.some(id => id === user.id)) {
 					set.mentionedUserIds = () => `array_append("mentionedUserIds", '${user.id}')`;
 					set.mentionedUsersCount = () => '"mentionedUsersCount" + 1';
@@ -155,94 +144,4 @@ export class HashtagService {
 			}
 		}
 	}
-
-	@bindThis
-	public async updateHashtagsRanking(hashtag: string, userId: MiUser['id']): Promise<void> {
-		const instance = await this.metaService.fetch();
-		const hiddenTags = instance.hiddenTags.map(t => normalizeForSearch(t));
-		if (hiddenTags.includes(hashtag)) return;
-
-		// YYYYMMDDHHmm (10分間隔)
-		const now = new Date();
-		now.setMinutes(Math.floor(now.getMinutes() / 10) * 10, 0, 0);
-		const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
-
-		const exist = await this.redisClient.sismember(`hashtagUsers:${hashtag}`, userId);
-		if (exist === 1) return;
-
-		this.featuredService.updateHashtagsRanking(hashtag, 1);
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		// チャート用
-		redisPipeline.pfadd(`hashtagUsers:${hashtag}:${window}`, userId);
-		redisPipeline.expire(`hashtagUsers:${hashtag}:${window}`,
-			60 * 60 * 24 * 3, // 3日間
-			'NX', // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
-		);
-
-		// ユニークカウント用
-		// TODO: Bloom Filter を使うようにしても良さそう
-		redisPipeline.sadd(`hashtagUsers:${hashtag}`, userId);
-		redisPipeline.expire(`hashtagUsers:${hashtag}`,
-			60 * 60, // 1時間
-			'NX', // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
-		);
-
-		redisPipeline.exec();
-	}
-
-	@bindThis
-	public async getChart(hashtag: string, range: number): Promise<number[]> {
-		const now = new Date();
-		now.setMinutes(Math.floor(now.getMinutes() / 10) * 10, 0, 0);
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		for (let i = 0; i < range; i++) {
-			const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
-			redisPipeline.pfcount(`hashtagUsers:${hashtag}:${window}`);
-			now.setMinutes(now.getMinutes() - (i * 10), 0, 0);
-		}
-
-		const result = await redisPipeline.exec();
-
-		if (result == null) return [];
-
-		return result.map(x => x[1]) as number[];
-	}
-
-	@bindThis
-	public async getCharts(hashtags: string[], range: number): Promise<Record<string, number[]>> {
-		const now = new Date();
-		now.setMinutes(Math.floor(now.getMinutes() / 10) * 10, 0, 0);
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		for (let i = 0; i < range; i++) {
-			const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
-			for (const hashtag of hashtags) {
-				redisPipeline.pfcount(`hashtagUsers:${hashtag}:${window}`);
-			}
-			now.setMinutes(now.getMinutes() - (i * 10), 0, 0);
-		}
-
-		const result = await redisPipeline.exec();
-
-		if (result == null) return {};
-
-		// key is hashtag
-		const charts = {} as Record<string, number[]>;
-		for (const hashtag of hashtags) {
-			charts[hashtag] = [];
-		}
-
-		for (let i = 0; i < range; i++) {
-			for (let j = 0; j < hashtags.length; j++) {
-				charts[hashtags[j]].push(result[(i * hashtags.length) + j][1] as number);
-			}
-		}
-
-		return charts;
-	}
 }

packages/backend/src/core/InstanceActorService.ts

@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { IsNull } from 'typeorm';
-import type { MiLocalUser } from '@/models/User.js';
+import type { MiLocalUser } from '@/models/entities/User.js';
 import type { UsersRepository } from '@/models/_.js';
 import { MemorySingleCache } from '@/misc/cache.js';
 import { DI } from '@/di-symbols.js';

packages/backend/src/core/MetaService.ts

@@ -7,10 +7,10 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
-import { MiMeta } from '@/models/Meta.js';
+import { MiMeta } from '@/models/entities/Meta.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { StreamMessages } from '@/server/api/stream/types.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -46,7 +46,7 @@ export class MetaService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'metaUpdated': {
 					this.cache = body;

packages/backend/src/core/MfmService.ts

@@ -10,7 +10,7 @@ import { Window } from 'happy-dom';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { intersperse } from '@/misc/prelude/array.js';
-import type { IMentionedRemoteUsers } from '@/models/Note.js';
+import type { IMentionedRemoteUsers } from '@/models/entities/Note.js';
 import { bindThis } from '@/decorators.js';
 import * as TreeAdapter from '../../node_modules/parse5/dist/tree-adapters/default.js';
 import type * as mfm from 'mfm-js';