Bump version to 2025.8.0-alpha.4

コントロールパネルの検索 (#16343 )
* Update settings.vue * Update settings.vue * Update settings.vue * Update settings.vue * Update settings.vue * Update performance.vue * Update performance.vue * Update performance.vue * Update external-services.vue * wip * wip * Update security.vue * Update settings.vue * Update CHANGELOG.md * wip * Update moderation.vue * wip * Update branding.vue * wip * Update email-settings.vue * Update system-webhook.vue * Update MkSuperMenu.vue * Update index.vue
2026-08-01 04:45:51 +00:00 · 2025-08-03 02:05:40 +00:00 · 2025-08-03 11:02:20 +09:00 · 2025-08-03 10:01:25 +09:00 · 2025-08-02 17:16:24 +09:00 · 2025-08-02 16:20:08 +09:00
563 changed files with 59371 additions and 40391 deletions
@@ -13,3 +13,7 @@ trim_trailing_whitespace = false

 [*.{yml,yaml}]
 indent_style = space
+
+[packages/backend/migration/*.js]
+indent_style = space
+indent_size = 4
@@ -1 +1 @@
-20.10.0
+22.15.0
@@ -15,3 +15,5 @@ redis:
  host: 127.0.0.1
  port: 56312
 id: aidx
+
+proxyRemoteFiles: true
@@ -26,6 +26,8 @@ jobs:
        with:
          node-version-file: '.node-version'
          cache: 'pnpm'
+          # see https://docs.github.com/actions/use-cases-and-examples/publishing-packages/publishing-nodejs-packages#publishing-packages-to-the-npm-registry
+          registry-url: 'https://registry.npmjs.org'
      - name: Publish package
        run: |
          pnpm i --frozen-lockfile
@@ -18,6 +18,14 @@ on:
      - packages/misskey-js/**
      - .github/workflows/test-backend.yml
      - .github/misskey/test.yml
+  workflow_dispatch:
+    inputs:
+      force_ffmpeg_cache_update:
+        description: 'Force update ffmpeg cache'
+        required: false
+        default: false
+        type: boolean
+
 jobs:
  unit:
    name: Unit tests (backend)
@@ -47,7 +55,22 @@ jobs:
        submodules: true
    - name: Setup pnpm
      uses: pnpm/action-setup@v4.1.0
+    - name: Get current date
+      id: current-date
+      run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+    - name: Setup and Restore ffmpeg/ffprobe Cache
+      id: cache-ffmpeg
+      uses: actions/cache@v4
+      with:
+        path: |
+          /usr/local/bin/ffmpeg
+          /usr/local/bin/ffprobe
+        # daily cache
+        key: ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }}
+        restore-keys: |
+          ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }}
    - name: Install FFmpeg
+      if: steps.cache-ffmpeg.outputs.cache-hit != 'true' || github.event.inputs.force_ffmpeg_cache_update == true
      run: |
        for i in {1..3}; do
          echo "Attempt $i: Installing FFmpeg..."
@@ -86,6 +109,7 @@ jobs:
    name: E2E tests (backend)
    runs-on: ubuntu-latest
    strategy:
+      fail-fast: false
      matrix:
        node-version-file:
          - .node-version
@@ -129,3 +153,47 @@ jobs:
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
          files: ./packages/backend/coverage/coverage-final.json
+
+  migration:
+    name: Migration tests (backend)
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version-file:
+          - .node-version
+          #- .github/min.node-version
+
+    services:
+      postgres:
+        image: postgres:15
+        ports:
+          - 54312:5432
+        env:
+          POSTGRES_DB: test-misskey
+          POSTGRES_HOST_AUTH_METHOD: trust
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          submodules: true
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4.1.0
+      - name: Get current date
+        id: current-date
+        run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+      - name: Use Node.js
+        uses: actions/setup-node@v4.4.0
+        with:
+          node-version-file: ${{ matrix.node-version-file }}
+          cache: 'pnpm'
+      - run: pnpm i --frozen-lockfile
+      - name: Check pnpm-lock.yaml
+        run: git diff --exit-code pnpm-lock.yaml
+      - name: Copy Configure
+        run: cp .github/misskey/test.yml .config
+      - name: Build
+        run: pnpm build
+      - name: Run migrations
+        run: MISSKEY_CONFIG_YML=test.yml pnpm --filter backend migrate
+      - name: Check no migrations are remaining
+        run: MISSKEY_CONFIG_YML=test.yml pnpm --filter backend check-migrations
@@ -14,6 +14,13 @@ on:
      - packages/backend/**
      - packages/misskey-js/**
      - .github/workflows/test-federation.yml
+  workflow_dispatch:
+    inputs:
+      force_ffmpeg_cache_update:
+        description: 'Force update ffmpeg cache'
+        required: false
+        default: false
+        type: boolean

 jobs:
  test:
@@ -30,7 +37,22 @@ jobs:
          submodules: true
      - name: Setup pnpm
        uses: pnpm/action-setup@v4.1.0
+      - name: Get current date
+        id: current-date
+        run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+      - name: Setup and Restore ffmpeg/ffprobe Cache
+        id: cache-ffmpeg
+        uses: actions/cache@v4
+        with:
+          path: |
+            /usr/local/bin/ffmpeg
+            /usr/local/bin/ffprobe
+          # daily cache
+          key: ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }}
+          restore-keys: |
+            ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }}
      - name: Install FFmpeg
+        if: steps.cache-ffmpeg.outputs.cache-hit != 'true' || github.event.inputs.force_ffmpeg_cache_update == true
        run: |
          for i in {1..3}; do
            echo "Attempt $i: Installing FFmpeg..."
@@ -6,8 +6,12 @@
 	"files.associations": {
 		"*.test.ts": "typescript"
 	},
-	"jest.jestCommandLine": "pnpm run jest",
 	"jest.runMode": "on-demand",
+	"jest.virtualFolders": [
+		{ "name": "backend unit", "jestCommandLine": "pnpm -F backend run test" },
+		{ "name": "backend e2e", "jestCommandLine": "pnpm -F backend run test:e2e"},
+		{ "name": "misskey-js", "jestCommandLine": "pnpm -F misskey-js run jest" }
+	],
 	"editor.codeActionsOnSave": {
 		"source.fixAll": "explicit"
 	},
@@ -1,3 +1,124 @@
+## 2025.8.0
+
+### Note
+- サポートされるNode.jsの最小バージョンが**22.15.0**になりました
+
+### General
+- ノートを削除した際、関連するノートが同時に削除されないようになりました
+	- APIで、「replyIdが存在しているのにreplyがnull」や「renoteIdが存在しているのにrenoteがnull」であるという、今までにはなかったパターンが表れることになります
+- 定期的に参照されていない古いリモートの投稿を削除する機能が実装されました(コントロールパネル→パフォーマンス→Remote Notes Cleaning)
+	- 既存のサーバーでは**デフォルトでオフ**、新規サーバーでは**デフォルトでオン**になります
+	- データベースの肥大化を防止することが可能です
+	- 既存のサーバーで当機能を有効化した場合は、処理量が多くなるため、一時的にストレージ使用量が増加する可能性があります。
+		- 増加量を抑えるには、最大処理継続時間をデフォルトより短くしてください。
+- サーバーの初期設定が完了するまでは連合がオンにならないようになりました
+- 日本語における公開範囲名称の「ダイレクト」が「指名」に改称されました
+- mfm.jsをアップデートしました
+  - Enhance: Unicode 15.1 および 16.0 に収録されている絵文字に対応
+  - Enhance: acctに `.` が入っているユーザーのメンションに対応
+  - Fix: Unicode絵文字に隣接する異体字セレクタ（`U+FE0F`）が絵文字として認識される問題を修正
+
+### Client
+- Feat: セーフモード
+	- プラグイン・テーマ・カスタムCSSの使用でクライアントの起動に問題が発生した際に、これらを無効にして起動できます
+	- 以下の方法でセーフモードを起動できます
+		- `g` キーを連打する
+		- URLに`?safemode=true`を付ける
+		- PWAのショートカットで Safemode を選択して起動する
+- Enhance: コントロールパネルを検索できるように
+- Fix: 一部の設定検索結果が存在しないパスになる問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1171)
+- Fix: テーマエディタが動作しない問題を修正
+
+### Server
+- Enhance: ノートの削除処理の効率化
+- Enhance: 全体的なパフォーマンスの向上
+
+
+## 2025.7.0
+
+### Note
+- Node.jsの最小バージョンを20.10.0から20.18.1に引き上げました
+  - なお、特に必要がない限りNode.jsは推奨バージョンであるv22を使用するようにしてください
+
+### General
+- Feat: ノートの下書き機能
+- Feat: クリップ内でノートを検索できるように
+- Feat: Playを検索できるように
+- Feat: モデレーションにおいて、特定のドライブファイルを添付しているチャットメッセージを一覧できるように
+- Enhance: ウォーターマーク機能をロールで制御可能に
+
+### Client
+- Note: 「自動でもっと見る」オプションは無効になっています
+- Feat: モデログを検索できるように
+- Enhance: 設定の自動バックアップをオンにした直後に自動バックアップするように
+- Enhance: ファイルアップロード前にキャプション設定を行えるように
+- Enhance: ファイルアップロード時にセンシティブ設定されているか表示するように
+- Enhance: 投稿フォームにファイルをペースト/ドロップした際のUXを改善
+- Enhance: ページネーション(一覧表示)の並び順を逆にできるように
+- Enhance: ページネーション(一覧表示)の基準日時を指定できるように
+- Enhance: レンダリングパフォーマンスの向上
+- Fix: ファイルがドライブの既定アップロード先に指定したフォルダにアップロードされない問題を修正
+- Fix: プラグインをアンインストールしてもセーブデータが残る問題を修正
+- Fix: 数時間後Misskeyのタブに戻った際に、タブがスロットリングされている間の更新アニメーションを延々見せ続けられる問題を修正
+- Fix: 非ログイン時のハイライトノートの画像がCWの有無を考慮せず表示される問題を修正
+- Fix: レンジ選択・ドロップダウンにて、操作を無効にすべきところで無効にならない問題を修正
+- Fix: Pull to refreshが有効なときに横スクロールができない問題を修正
+
+### Server
+- Enhance: sinceId/untilIdが指定可能なエンドポイントにおいて、sinceDate/untilDateも指定可能に
+- Enhance: メールの送信者としてサーバー名を表示するように (サーバー名が設定されている場合)
+- Fix: ジョブキューのProgressの値を正しく計算する
+
+
+## 2025.6.3
+
+### Client
+- Fix: キャッシュを削除しないとクライアントが使用できないことがある問題を修正
+
+## 2025.6.2
+
+### Client
+- Fix: キャッシュを削除しないとクライアントが使用できないことがある問題を修正
+- 翻訳の更新
+
+## 2025.6.1
+
+### Note
+- AiScript Misskey拡張API（Misskey Webプラグイン）の[note_view_interruptor](https://misskey-hub.net/ja/docs/for-developers/plugin/plugin-api-reference/#pluginregister_note_view_interruptorfn)は不具合の影響により現在一時的に無効化されています。
+- Misskey Web投稿フォームのプレビュー切り替えは「...」メニュー内に配置されました
+
+### Client
+- Feat: 画像にウォーターマークを付与できるようになりました
+- Feat: 画像の加工ができるようになりました(実験的)
+- Enhance: ノートのリアクション一覧で、押せるリアクションを優先して表示できるようにするオプションを追加
+- Enhance: 全てのチャットメッセージを既読にできるように(設定→その他)
+- Enhance: ミュートした絵文字をデバイス間で同期できるように
+- Fix: ドライブファイルの選択が不安定な問題を修正
+- Fix: コントロールパネルのファイル欄などのデザインが崩れている問題を修正
+- Fix: ユーザーの検索結果を追加で読み込むことができない問題を修正
+- Fix: タッチ操作時にチャートのツールチップが消えなくなる場合がある問題を修正
+- Fix: ウェルカムタイムラインでリアクションが表示されない問題を修正
+- Fix: デッキのタイムラインカラムで新着ノート時のサウンドが再生されない問題を修正
+
+### Server
+- Feat: 全てのチャットメッセージを既読にするAPIを追加(chat/read-all)
+- Fix: アカウント削除が正常に行われないことがあった問題を修正
+- Fix: outboxのページネーションが正しく行われない問題を修正
+
+### Misskey.js
+- Fix: misskey-jsの drive/file/create でファイルアップロードができない問題を修正
+
+## 2025.6.0
+
+### Client
+- Enhance: 非同期的なコンポーネントの読み込み時のハンドリングを強化
+- Fix: リアクションの一部の絵文字が重複して表示されることがある問題を修正
+- Fix: 非利用者に対するユーザー作成コンテンツの公開範囲が全て非公開になっている場合にログインできない問題を修正
+
+### Server
+- Fix: 非利用者に対するユーザー作成コンテンツの公開範囲が全て非公開になっている場合でもusers/showを許可するように
+
 ## 2025.5.1

 ### Note
@@ -39,6 +160,7 @@
 - Feat: 絵文字をミュート可能にする機能
  - 絵文字（ユニコードの絵文字・カスタム絵文字）毎にミュートし、不可視化することができるようになりました
 - Feat: モバイルデバイスで折りたたまれたUIの展開表示に全画面ページを使用できるように(実験的)
+- Enhance: 設定の同期をオンにするときに競合したときに値をマージできるように
 - Enhance: メモリ使用量を軽減しました
 - Enhance: 画像の高品質なプレースホルダを無効化してパフォーマンスを向上させるオプションを追加
 - Enhance: 招待されているが参加していないルームを開いたときに、招待を承認するかどうか尋ねるように
@@ -53,6 +175,7 @@
  - フロントエンドの読み込みサイズを軽量化しました
 	- ほとんどの言語のハイライトは問題なく行えますが、互換性の問題により一部の言語が正常にハイライトできなくなる可能性があります。詳しくは https://shiki.style/references/engine-js-compat をご覧ください。
 - Fix: チャットに動画ファイルを送付すると、動画の表示が崩れてしまい視聴出来ない問題を修正
+- Fix: アカウント依存かつ初期状態である設定値をサーバー同期しようとした際に正しくコンフリクト検出されない問題を修正
 - Fix: "時計"ウィジェット(Clock)において、Transparent設定が有効でも、その背景が透過されない問題を修正
 - Fix: 一定時間操作がなかったら動画プレイヤーのコントロールを隠すように
 - Fix: Twitchのクリップがプレイヤーで再生できない問題を修正
@@ -70,7 +193,7 @@
 - Fix: ミュート対象ユーザーが引用されているノートがRNされたときにミュートを貫通してしまう問題を修正 #16009
 - Fix: 連合モードが「なし」の場合に、生成されるHTML内のactivity jsonへのリンクタグを省略するように
 - Fix: コントロールパネルから招待コードを作成すると作成者の情報が記録されない問題を修正
-
+- Fix: コントロールパネルのジョブキューページからPausedなジョブ一覧を閲覧できない問題を修正

 ## 2025.5.0

@@ -18,6 +18,7 @@ WORKDIR /misskey

 COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 COPY --link ["scripts", "./scripts"]
+COPY --link ["patches", "./patches"]
 COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/frontend-shared/package.json", "./packages/frontend-shared/"]
 COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
@@ -53,6 +54,7 @@ WORKDIR /misskey

 COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 COPY --link ["scripts", "./scripts"]
+COPY --link ["patches", "./patches"]
 COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
 COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
@@ -34,7 +34,6 @@ describe('Before setup instance', () => {

 		cy.intercept('POST', '/api/admin/update-meta').as('update-meta');

-		cy.get('[data-cy-next]').click();
 		cy.get('[data-cy-next]').click();
 		cy.get('[data-cy-server-name] input').type('Testskey');
 		cy.get('[data-cy-server-setup-wizard-apply]').click();
@@ -79,6 +78,8 @@ describe('After setup instance', () => {
 		cy.get('[data-cy-signup-password] input').type('alice1234');
 		cy.get('[data-cy-signup-submit]').should('be.disabled');
 		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
+		cy.get('[data-cy-signup-submit]').should('be.disabled');
+		cy.get('[data-cy-signup-invitation-code] input').type('test-invitation-code');
 		cy.get('[data-cy-signup-submit]').should('not.be.disabled');
 		cy.get('[data-cy-signup-submit]').click();

@@ -1008,6 +1008,8 @@ lastNDays: "آخر {n} أيام"
 surrender: "ألغِ"
 postForm: "أنشئ ملاحظة"
 information: "عن"
+inMinutes: "د"
+inDays: "ي"
 _chat:
  invitations: "دعوة"
  noHistory: "السجل فارغ"
@@ -1589,3 +1591,11 @@ _search:
  searchScopeAll: "الكل"
  searchScopeLocal: "المحلي"
  searchScopeUser: "مستخدم محدد"
+_watermarkEditor:
+  opacity: "الشفافية"
+  scale: "الحجم"
+  text: "نص"
+  position: "الموضع"
+  type: "نوع"
+  image: "صور"
+  advanced: "متقدم"
@@ -848,6 +848,8 @@ sourceCode: "সোর্স কোড"
 flip: "উল্টান"
 postForm: "নোট লিখুন"
 information: "আপনার সম্পর্কে"
+inMinutes: "মিনিট"
+inDays: "দিন"
 _chat:
  invitations: "আমন্ত্রণ"
  noHistory: "কোনো ইতিহাস নেই"
@@ -1349,3 +1351,9 @@ _remoteLookupErrors:
 _search:
  searchScopeAll: "সবগুলো"
  searchScopeLocal: "স্থানীয়"
+_watermarkEditor:
+  opacity: "অস্বচ্ছতা"
+  scale: "আকার"
+  text: "লেখা"
+  image: "ছবি"
+  advanced: "উন্নত"
@@ -327,6 +327,7 @@ dark: "Fosc"
 lightThemes: "Temes clars"
 darkThemes: "Temes foscos"
 syncDeviceDarkMode: "Sincronitza el mode fosc amb la configuració del dispositiu"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "\"{x}\" es troba activat. Vols desactivar la sincronització i canviar de mode manualment?"
 drive: "Disc"
 fileName: "Nom del Fitxer"
 selectFile: "Selecciona un fitxer"
@@ -895,7 +896,7 @@ searchResult: "Resultats de la cerca"
 hashtags: "Etiquetes"
 troubleshooting: "Solucionar problemes"
 useBlurEffect: "Fes servir efectes de desenfocament a la interfície"
-learnMore: "Saber més "
+learnMore: "Saber-ne més "
 misskeyUpdated: "Misskey s'ha actualitzat "
 whatIsNew: "Mostra canvis"
 translate: "Traduir "
@@ -1312,6 +1313,7 @@ availableRoles: "Roles disponibles "
 acknowledgeNotesAndEnable: "Activa'l després de comprendre els possibles perills."
 federationSpecified: "Aquest servidor treballa amb una federació de llistes blanques. No pot interactuar amb altres servidors que no siguin els especificats per l'administrador."
 federationDisabled: "La unió es troba deshabilitada en aquest servidor. No es pot interactuar amb usuaris d'altres servidors."
+draft: "Esborrany "
 confirmOnReact: "Confirmar en reaccionar"
 reactAreYouSure: "Vols reaccionar amb \"{emoji}\"?"
 markAsSensitiveConfirm: "Vols marcar aquest contingut com a sensible?"
@@ -1329,6 +1331,7 @@ restore: "Restaurar "
 syncBetweenDevices: "Sincronització entre dispositius"
 preferenceSyncConflictTitle: "Els valors de la configuració ja existeixen al dispositiu"
 preferenceSyncConflictText: "Un element de la configuració amb sincronització activada desa els seus valors al servidor, però s'ha trobat un valor a la configuració desat al servidor per aquest element de la configuració. Quin valor us sobreescriure?"
+preferenceSyncConflictChoiceMerge: "Integració "
 preferenceSyncConflictChoiceServer: "Valors de configuració del servidor"
 preferenceSyncConflictChoiceDevice: "Punts d'ajustos del dispositiu "
 preferenceSyncConflictChoiceCancel: "Cancel·lar l'activació de la sincronització "
@@ -1348,7 +1351,7 @@ embed: "Incrustar"
 settingsMigrating: "Estem migrant la teva configuració. Si us plau espera un moment... (També pots fer la migració més tard, manualment, anant a Preferències → Altres → Migrar configuració antiga)"
 readonly: "Només lectura"
 goToDeck: "Tornar al tauler"
-federationJobs: "Treballs sindicats "
+federationJobs: "Treballs de federació"
 driveAboutTip: "Al Disc veure's una llista de tots els arxius que has anat pujant.<br>\nPots tornar-los a fer servir adjuntant-los a notes noves o pots adelantar-te i pujar arxius per publicar-los més tard!<br>\n<b>Tingués en compte que si esborres un arxiu també desapareixerà de tots els llocs on l'has fet servir (notes, pàgines, avatars, imatges de capçalera, etc.)</b><br>\nTambé pots crear carpetes per organitzar les."
 scrollToClose: "Desplaçar per tancar"
 advice: "Consell"
@@ -1363,6 +1366,13 @@ abort: "Cancel·lar"
 tip: "Trucs i consells"
 redisplayAllTips: "Torna ha mostrat tots els trucs i consells"
 hideAllTips: "Amagar tots els trucs i consells"
+defaultImageCompressionLevel: "Nivell de comprensió de la imatge per defecte"
+defaultImageCompressionLevel_description: "Baixa, conserva la qualitat de la imatge però la mida de l'arxiu és més gran. <br>Alta, redueix la mida de l'arxiu però també la qualitat de la imatge."
+inMinutes: "Minut(s)"
+inDays: "Di(a)(es)"
+_order:
+  newest: "Més recent"
+  oldest: "Cronològic"
 _chat:
  noMessagesYet: "Encara no tens missatges "
  newMessage: "Missatge nou"
@@ -1450,6 +1460,7 @@ _settings:
  contentsUpdateFrequency_description: "Com més alt sigui l'adquisició de contingut en temps real, més baixa el rendiment i més consum de dades i bateria."
  contentsUpdateFrequency_description2: "Quan s'activa el mode en temps real, el contingut s'actualitza en temps real, independentment d'aquesta configuració."
  showUrlPreview: "Mostrar vista prèvia d'URL"
+  showAvailableReactionsFirstInNote: "Mostra les reacciones que pots fer servir al damunt"
  _chat:
    showSenderName: "Mostrar el nom del remitent"
    sendOnEnter: "Introdueix per enviar"
@@ -1988,6 +1999,8 @@ _role:
    uploadableFileTypes: "Tipus de fitxers que en podeu pujar"
    uploadableFileTypes_caption: "Especifica el tipus MIME. Es poden especificar diferents tipus MIME separats amb una nova línia, i es poden especificar comodins amb asteriscs (*). (Per exemple: image/*)"
    uploadableFileTypes_caption2: "Pot que no sigui possible determinar el tipus MIME d'alguns arxius. Per permetre aquests tipus d'arxius afegeix {x} a les especificacions."
+    noteDraftLimit: "Nombre possible d'esborranys de notes al servidor"
+    watermarkAvailable: "Pots fer servir la marca d'aigua"
  _condition:
    roleAssignedTo: "Assignat a rols manuals"
    isLocal: "Usuari local"
@@ -2147,6 +2160,7 @@ _theme:
  install: "Instal·lar un tema"
  manage: "Gestionar els temes "
  code: "Codi del tema"
+  copyThemeCode: "Copiar el codi del tema"
  description: "Descripció"
  installed: "{name} Instal·lat "
  installedThemes: "Temes instal·lats "
@@ -2460,6 +2474,8 @@ _visibility:
  disableFederation: "Sense federar"
  disableFederationDescription: "No enviar a altres servidors"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "Hi ha arxius que no s'han carregat, vols descartar-los i tancar el formulari?"
+  uploaderTip: "L'arxiu encara no s'ha carregat. Des del menú arxiu pots canviar el nom, retallar imatges, posar marques d'aigua i comprimir o no l'arxiu. Els arxius es carreguen automàticament quan públiques una nota."
  replyPlaceholder: "Contestar..."
  quotePlaceholder: "Citar..."
  channelPlaceholder: "Publicar a un canal..."
@@ -2793,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "Pujat el"
  attachedNotes: "Notes amb aquest fitxer"
+  usage: "Ús "
  thisPageCanBeSeenFromTheAuthor: "Aquesta pàgina només la pot veure l'usuari que ha pujat aquest fitxer."
 _externalResourceInstaller:
  title: "Instal·lar des d'un lloc extern"
@@ -3096,6 +3113,7 @@ _serverSetupWizard:
    text2: "Si ho desitges, agrairíem molt la teva donació per poder seguir desenvolupant el projecte."
    text3: "També hi ha privilegis especials per als donants!"
 _uploader:
+  editImage: "Edició d'imatges"
  compressedToX: "Comprimit a {x}"
  savedXPercent: "{x}% d'estalvi "
  abortConfirm: "Hi ha un arxiu que no s'ha pujat, vols cancel·lar?"
@@ -3115,3 +3133,67 @@ _clip:
  tip: "Clip és una funció que permet organitzar les teves notes."
 _userLists:
  tip: "Es poden crear llistes amb qualsevol usuari. La llista creada es pot mostrar com una línia de temps."
+watermark: "Marca d'aigua "
+defaultPreset: "Per defecte"
+_watermarkEditor:
+  tip: "A la imatge es pot afegir una marca d'aigua com informació sobre drets."
+  quitWithoutSaveConfirm: "Sortir sense desar?"
+  driveFileTypeWarn: "Aquest arxiu no és compatible"
+  driveFileTypeWarnDescription: "Selecciona un arxiu d'imatge "
+  title: "Editar la marca d'aigua "
+  cover: "Cobrir-ho tot"
+  repeat: "Repetir"
+  opacity: "Opacitat"
+  scale: "Mida"
+  text: "Text"
+  position: "Posició "
+  type: "Tipus"
+  image: "Imatges"
+  advanced: "Avançat"
+  stripe: "Bandes"
+  stripeWidth: "Amplada de la banda"
+  stripeFrequency: "Freqüència de la banda"
+  angle: "Angle"
+  polkadot: "Lunars"
+  checker: "Escacs"
+  polkadotMainDotOpacity: "Opacitat del lunar principal"
+  polkadotMainDotRadius: "Mida del lunar principal"
+  polkadotSubDotOpacity: "Opacitat del lunar secundari"
+  polkadotSubDotRadius: "Mida del lunar secundari"
+  polkadotSubDotDivisions: "Nombre de punts secundaris"
+_imageEffector:
+  title: "Efecte"
+  addEffect: "Afegeix un efecte"
+  discardChangesConfirm: "Vols descartar els canvis i sortir?"
+  _fxs:
+    chromaticAberration: "Aberració cromàtica"
+    glitch: "Glitch"
+    mirror: "Mirall"
+    invert: "Inversió cromàtica "
+    grayscale: "Monocrom "
+    colorAdjust: "Correcció de color"
+    colorClamp: "Compressió cromàtica "
+    colorClampAdvanced: "Compressió de cromàtica avançada "
+    distort: "Distorsió "
+    threshold: "Binarització"
+    zoomLines: "Saturació de línies "
+    stripe: "Bandes"
+    polkadot: "Lunars"
+    checker: "Escacs"
+    blockNoise: "Bloqueig de soroll"
+    tearing: "Trencament d'imatge "
+drafts: "Esborrany "
+_drafts:
+  select: "Seleccionar esborrany"
+  cannotCreateDraftAnymore: "S'ha sobrepassat el nombre màxim d'esborranys que es poden crear."
+  cannotCreateDraft: "Amb aquest contingut no es poden crear esborranys."
+  delete: "Esborrar esborranys"
+  deleteAreYouSure: "Vols esborrar els esborranys?"
+  noDrafts: "No hi ha esborranys"
+  replyTo: "Respondre a {user}"
+  quoteOf: "Citar les notes de {user}"
+  postTo: "Destinat a {channel}"
+  saveToDraft: "Desar com a esborrany"
+  restoreFromDraft: "Restaurar des dels esborranys"
+  restore: "Restaurar esborrany"
+  listDrafts: "Llistat d'esborranys"
@@ -1107,6 +1107,8 @@ lastNDays: "Posledních {n} dnů"
 surrender: "Zrušit"
 postForm: "Formulář pro odeslání"
 information: "Informace"
+inMinutes: "Minut"
+inDays: "Dnů"
 _chat:
  invitations: "Pozvat"
  noHistory: "Žádná historie"
@@ -2043,3 +2045,11 @@ _search:
  searchScopeAll: "Vše"
  searchScopeLocal: "Místní"
  searchScopeUser: "Upřesnit uživatele"
+_watermarkEditor:
+  opacity: "Průhlednost"
+  scale: "Velikost"
+  text: "Text"
+  position: "Pozice"
+  type: "Typ"
+  image: "Obrázky"
+  advanced: "Pokročilé"
@@ -298,6 +298,7 @@ uploadFromUrl: "Von einer URL hochladen"
 uploadFromUrlDescription: "URL der hochzuladenden Datei"
 uploadFromUrlRequested: "Upload angefordert"
 uploadFromUrlMayTakeTime: "Es kann eine Weile dauern, bis das Hochladen abgeschlossen ist."
+uploadNFiles: "Lade {n} Dateien hoch"
 explore: "Erkunden"
 messageRead: "Gelesen"
 noMoreHistory: "Kein weiterer Verlauf vorhanden"
@@ -326,6 +327,7 @@ dark: "Dunkel"
 lightThemes: "Helle Farbschemata"
 darkThemes: "Dunkle Farbschemata"
 syncDeviceDarkMode: "Einstellung deines Geräts übernehmen"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "\"{x}\" ist eingeschaltet. Möchtest du die Synchronisation ausschalten und den Modus manuell wechseln?"
 drive: "Drive"
 fileName: "Dateiname"
 selectFile: "Datei auswählen"
@@ -575,8 +577,10 @@ showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik an
 showFixedPostFormInChannel: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen (Kanäle)"
 withRepliesByDefaultForNewlyFollowed: "Standardmäßig Antworten von neu gefolgten Benutzern in der Chronik anzeigen"
 newNoteRecived: "Es gibt neue Notizen"
+newNote: "Neue Notiz"
 sounds: "Töne"
 sound: "Töne"
+notificationSoundSettings: "Benachrichtigungston festlegen"
 listen: "Anhören"
 none: "Nichts"
 showInPage: "In einer Seite anzeigen"
@@ -791,6 +795,7 @@ wide: "Breit"
 narrow: "Schmal"
 reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
 needReloadToApply: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft."
+needToRestartServerToApply: "Diese Einstellung tritt nach einem Neustart des Servers in Kraft."
 showTitlebar: "Titelleiste anzeigen"
 clearCache: "Cache leeren"
 onlineUsersCount: "{n} Benutzer sind online"
@@ -997,6 +1002,7 @@ failedToUpload: "Hochladen fehlgeschlagen"
 cannotUploadBecauseInappropriate: "Diese Datei kann nicht hochgeladen werden, da Anteile der Datei als möglicherweise unangebracht festgestellt wurden."
 cannotUploadBecauseNoFreeSpace: "Die Datei konnte nicht hochgeladen werden, da dein Drive-Speicherplatz aufgebraucht ist."
 cannotUploadBecauseExceedsFileSizeLimit: "Diese Datei kann wegen Überschreitung der Maximalgröße nicht hochgeladen werden."
+cannotUploadBecauseUnallowedFileType: "Hochladen nicht möglich wegen unzulässigem Dateityp."
 beta: "Beta"
 enableAutoSensitive: "Automarkierung sensibler Medien"
 enableAutoSensitiveDescription: "Setzt soweit möglich durch Verwendung von Machine Learning automatisch Markierungen für sensible Medien. Auch wenn du diese Option deaktiviert hast, ist sie möglicherweise auf Instanzebene aktiviert."
@@ -1307,6 +1313,7 @@ availableRoles: "Verfügbare Rollen"
 acknowledgeNotesAndEnable: "Schalten Sie dies erst ein, wenn Sie die Vorsichtsmaßnahmen verstanden haben."
 federationSpecified: "Dieser Server arbeitet mit Whitelist-Föderation. Er kann nicht mit anderen als den vom Administrator angegebenen Servern interagieren."
 federationDisabled: "Föderation ist auf diesem Server deaktiviert. Es ist nicht möglich, mit Benutzern auf anderen Servern zu interagieren."
+draft: "Entwurf"
 confirmOnReact: "Reagieren bestätigen"
 reactAreYouSure: "Willst du eine \"{emoji}\"-Reaktion hinzufügen?"
 markAsSensitiveConfirm: "Möchtest du dieses Medium als sensibel kennzeichnen?"
@@ -1324,6 +1331,7 @@ restore: "Wiederherstellen"
 syncBetweenDevices: "Zwischen Geräten synchronisieren"
 preferenceSyncConflictTitle: "Der konfigurierte Wert ist auf dem Server bereits vorhanden."
 preferenceSyncConflictText: "Die Einstellungen mit aktivierter Synchronisierung werden ihre Werte auf dem Server speichern. Es gibt jedoch bereits Werte auf dem Server. Welche Einstellungswerte sollen überschrieben werden?"
+preferenceSyncConflictChoiceMerge: "Zusammenführen"
 preferenceSyncConflictChoiceServer: "Konfigurierte Werte auf dem Server"
 preferenceSyncConflictChoiceDevice: "Konfigurierte Werte auf dem Gerät"
 preferenceSyncConflictChoiceCancel: "Einrichten der Synchronisierung abbrechen"
@@ -1340,12 +1348,31 @@ right: "Rechts"
 bottom: "Unten"
 top: "Oben"
 embed: "Einbetten"
-settingsMigrating: "Ihre Einstellungen werden gerade migriert, Bitte warten Sie einen Moment... (Sie können die Einstellungen später auch manuell migrieren, indem Sie zu Einstellungen → Sonstiges → Alte Einstellungen migrieren gehen)"
+settingsMigrating: "Deine Einstellungen werden gerade migriert. Bitte warte einen Moment... (Du kannst die Einstellungen später auch manuell migrieren, indem du zu Einstellungen → Anderes → Alte Einstellungen migrieren gehst)"
 readonly: "Nur Lesezugriff"
 goToDeck: "Zurück zum Deck"
 federationJobs: "Föderation Jobs"
 driveAboutTip: "In Drive sehen Sie eine Liste der Dateien, die Sie in der Vergangenheit hochgeladen haben. <br>\nSie können diese Dateien wiederverwenden um sie zu beispiel an Notizen anzuhängen, oder sie können Dateien vorab hochzuladen, um sie später zu versenden! <br>\n<b>Wenn Sie eine Datei löschen, verschwindet sie auch von allen Stellen, an denen Sie sie verwendet haben (Notizen, Seiten, Avatare, Banner usw.).</b><br>\nSie können auch Ordner erstellen, um sie zu organisieren."
 scrollToClose: "Zum Schließen scrollen"
+advice: "Tipps"
+realtimeMode: "Echtzeit-Modus"
+turnItOn: "Einschalten"
+turnItOff: "Ausschalten"
+emojiMute: "Emoji stummschalten"
+emojiUnmute: "Emoji-Stummschaltung aufheben"
+muteX: "{x} stummschalten"
+unmuteX: "Stummschaltung von {x} aufheben"
+abort: "Abbrechen"
+tip: "Tipps und Tricks"
+redisplayAllTips: "Alle „Tipps und Tricks“ wieder anzeigen"
+hideAllTips: "Alle „Tipps und Tricks“ ausblenden"
+defaultImageCompressionLevel: "Standard-Bildkomprimierungsstufe"
+defaultImageCompressionLevel_description: "Ein niedrigerer Wert erhält die Bildqualität, erhöht aber die Dateigröße. <br>Höhere Werte reduzieren die Dateigröße, verringern aber die Bildqualität."
+inMinutes: "Minute(n)"
+inDays: "Tag(en)"
+_order:
+  newest: "Neueste zuerst"
+  oldest: "Älteste zuerst"
 _chat:
  noMessagesYet: "Noch keine Nachrichten"
  newMessage: "Neue Nachricht"
@@ -1379,6 +1406,8 @@ _chat:
  chatNotAvailableInOtherAccount: "Die Chatfunktion wurde vom anderen Benutzer deaktiviert."
  cannotChatWithTheUser: "Starten eines Chats mit diesem Benutzer nicht möglich"
  cannotChatWithTheUser_description: "Der Chat ist entweder nicht verfügbar oder die andere Seite hat den Chat nicht aktiviert."
+  youAreNotAMemberOfThisRoomButInvited: "Du bist kein Teilnehmer in diesem Raum, aber du hast eine Einladung erhalten. Bitte nimm die Einladung an, um beizutreten."
+  doYouAcceptInvitation: "Nimmst du die Einladung an?"
  chatWithThisUser: "Mit dem Benutzer chatten"
  thisUserAllowsChatOnlyFromFollowers: "Dieser Benutzer nimmt nur Chats von Followern an."
  thisUserAllowsChatOnlyFromFollowing: "Dieser Benutzer nimmt nur Chats von Benutzern an, denen er folgt."
@@ -1418,12 +1447,20 @@ _settings:
  makeEveryTextElementsSelectable: "Alle Textelemente auswählbar machen"
  makeEveryTextElementsSelectable_description: "Die Aktivierung kann in manchen Situationen die Benutzerfreundlichkeit beeinträchtigen."
  useStickyIcons: "Icons beim Scrollen folgen lassen"
+  enableHighQualityImagePlaceholders: "Zeige Platzhalter für Bilder in hoher Qualität an"
+  uiAnimations: "Animationen der Benutzeroberfläche"
  showNavbarSubButtons: "Unterschaltflächen in der Navigationsleiste anzeigen"
  ifOn: "Wenn eingeschaltet"
  ifOff: "Wenn ausgeschaltet"
  enableSyncThemesBetweenDevices: "Synchronisierung von installierten Themen auf verschiedenen Endgeräten"
  enablePullToRefresh: "Ziehen zum Aktualisieren"
  enablePullToRefresh_description: "Bei Benutzung einer Maus, mit gedrücktem Mausrad ziehen"
+  realtimeMode_description: "Stellt eine Verbindung mit dem Server her und aktualisiert die Inhalte in Echtzeit. Kann zu mehr Datenverkehr einem höheren Akkuverbrauch führen."
+  contentsUpdateFrequency: "Häufigkeit des Abrufs von Inhalten"
+  contentsUpdateFrequency_description: "Je höher der Wert, desto häufiger werden die Inhalte aktualisiert, aber die Leistung sinkt und der Datenverkehr und der Akkuverbrauch steigen."
+  contentsUpdateFrequency_description2: "Wenn der Echtzeitmodus aktiviert ist, werden die Inhalte unabhängig von dieser Einstellung in Echtzeit aktualisiert."
+  showUrlPreview: "URL-Vorschau anzeigen"
+  showAvailableReactionsFirstInNote: "Zeige die verfügbaren Reaktionen im oberen Bereich an."
  _chat:
    showSenderName: "Name des Absenders anzeigen"
    sendOnEnter: "Eingabetaste sendet Nachricht"
@@ -1604,6 +1641,21 @@ _serverSettings:
  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Wenn über einen bestimmten Zeitraum keine Moderatorenaktivität festgestellt wird, wird diese Einstellung automatisch deaktiviert, um Spam zu verhindern."
  deliverSuspendedSoftware: "Software, die nicht mehr beliefert wird"
  deliverSuspendedSoftwareDescription: "Sie können eine Auswahl von Namen und Versionen verschiedener Serversoftware angeben, um die Zustellung zu stoppen, z. B. aufgrund von Sicherheitslücken. Diese Versionsinformationen werden vom Server bereitgestellt und ihre Zuverlässigkeit ist nicht garantiert. Es wird jedoch empfohlen, eine Vorabversion anzugeben, wie z. B. >= 2024.3.1-0, da die Angabe >= 2024.3.1 keine benutzerdefinierten Versionen wie 2024.3.1-custom.0 einschließt."
+  singleUserMode: "Einzelbenutzermodus"
+  singleUserMode_description: "Wenn du der einzige Benutzer dieses Servers bist, optimiert die Aktivierung dieses Modus die Leistung des Servers."
+  signToActivityPubGet: "ActivityPub-GET-Anfragen signieren"
+  signToActivityPubGet_description: "Normalerweise sollte diese Option aktiviert sein. Die Deaktivierung kann Probleme im Zusammenhang mit der Föderation beheben, aber andererseits könnte sie die Föderation mit einigen anderen Servern deaktivieren."
+  proxyRemoteFiles: "Proxy für Dateien fremder Instanzen"
+  proxyRemoteFiles_description: "Wenn diese Einstellung aktiviert ist, werden fremde Dateien über einen Proxyserver übertragen und bereitgestellt. Dies hilft bei der Erstellung von Vorschaubildern und schützt die Privatsphäre der Benutzer."
+  allowExternalApRedirect: "Weiterleitungen für Anfragen über ActivityPub zulassen"
+  allowExternalApRedirect_description: "Wenn diese Option aktiviert ist, können andere Server Inhalte von Drittanbietern über diesen Server abfragen, was jedoch zu Content-Spoofing führen kann."
+  userGeneratedContentsVisibilityForVisitor: "Sichtbarkeit von nutzergenerierten Inhalten für Gäste"
+  userGeneratedContentsVisibilityForVisitor_description: "Dies ist nützlich, um zu verhindern, dass unangemessene Inhalte, die nicht gut moderiert sind, ungewollt über deinen eigenen Server im Internet veröffentlicht werden."
+  userGeneratedContentsVisibilityForVisitor_description2: "Die uneingeschränkte Veröffentlichung aller Inhalte des Servers im Internet, einschließlich der vom Server empfangenen Fremdinhalte, birgt Risiken. Dies ist besonders wichtig für Betrachter, die sich des dezentralen Charakters der Inhalte nicht bewusst sind, da sie selbst fremde Inhalte fälschlicherweise als auf dem Server erstellte Inhalte wahrnehmen könnten."
+  _userGeneratedContentsVisibilityForVisitor:
+    all: "Alles ist öffentlich"
+    localOnly: "Nur lokale Inhalte werden veröffentlicht, fremde Inhalte bleiben privat"
+    none: "Alles ist privat"
 _accountMigration:
  moveFrom: "Von einem anderen Konto zu diesem migrieren"
  moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1944,6 +1996,11 @@ _role:
    canImportMuting: "Importieren von Stummgeschalteten zulassen"
    canImportUserLists: "Importieren von Listen erlauben"
    chatAvailability: "Chatten erlauben"
+    uploadableFileTypes: "Hochladbare Dateitypen"
+    uploadableFileTypes_caption: "Gibt die zulässigen MIME-/Dateitypen an. Mehrere MIME-Typen können durch einen Zeilenumbruch getrennt angegeben werden, und Platzhalter können mit einem Sternchen (*) angegeben werden. (z. B. image/*)"
+    uploadableFileTypes_caption2: "Bei manchen Dateien ist es nicht möglich, den Typ zu bestimmen. Um solche Dateien zuzulassen, füge {x} der Spezifikation hinzu."
+    noteDraftLimit: "Anzahl der möglichen Entwürfe für serverseitige Notizen"
+    watermarkAvailable: "Kann die Wasserzeichenfunktion verwenden"
  _condition:
    roleAssignedTo: "Manuellen Rollen zugewiesen"
    isLocal: "Lokaler Benutzer"
@@ -2103,6 +2160,7 @@ _theme:
  install: "Farbschemata installieren"
  manage: "Farbschemaverwaltung"
  code: "Farbschemencode"
+  copyThemeCode: "Farbschemencode kopieren"
  description: "Beschreibung"
  installed: "{name} wurde installiert"
  installedThemes: "Installierte Farbschemata"
@@ -2416,6 +2474,8 @@ _visibility:
  disableFederation: "Deföderieren"
  disableFederationDescription: "Nicht an andere Instanzen übertragen"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "Es gibt Dateien, die nicht hochgeladen wurden. Möchtest du diese verwerfen und das Formular schließen?"
+  uploaderTip: "Die Datei wurde noch nicht hochgeladen. Über das Dateimenü kannst du sie umbenennen, das Bild zuschneiden, ein Wasserzeichen hinzufügen, komprimieren usw. Die Datei wird automatisch hochgeladen, wenn du eine Notiz veröffentlichst."
  replyPlaceholder: "Dieser Notiz antworten …"
  quotePlaceholder: "Diese Notiz zitieren …"
  channelPlaceholder: "In einen Kanal senden"
@@ -2796,6 +2856,12 @@ _dataSaver:
  _avatar:
    title: "Animierte Profilbilder deaktivieren"
    description: "Die Animation von Profilbildern wird angehalten. Da animierte Bilder eine größere Dateigröße haben können als normale Bilder, kann dies den Datenverkehr weiter reduzieren."
+  _urlPreviewThumbnail:
+    title: "URL-Vorschaubilder ausblenden"
+    description: "URL-Vorschaubilder werden nicht mehr geladen."
+  _disableUrlPreview:
+    title: "URL-Vorschau deaktivieren"
+    description: "Deaktiviert die URL-Vorschaufunktion. Anders als bei reinen Vorschaubildern wird dadurch das Laden der verlinkten Informationen selbst reduziert."
  _code:
    title: "Code-Hervorhebungen ausblenden"
    description: "Wenn Code-Hervorhebungen in MFM usw. verwendet werden, werden sie erst geladen, wenn sie angetippt werden. Die Syntaxhervorhebung erfordert das Herunterladen der Definitionsdateien für jede Programmiersprache. Es ist daher zu erwarten, dass die Deaktivierung des automatischen Ladens dieser Dateien die Menge des Datenverkehrs reduziert."
@@ -2853,6 +2919,8 @@ _offlineScreen:
 _urlPreviewSetting:
  title: "Einstellungen der URL-Vorschau"
  enable: "URL-Vorschau aktivieren"
+  allowRedirect: "Umleitung von URL-Vorschauen erlauben"
+  allowRedirectDescription: "Wenn für eine URL eine Umleitung festgelegt ist, kann diese Funktion aktiviert werden, um der Umleitung zu folgen und eine Vorschau des umgeleiteten Inhalts anzuzeigen. Die Deaktivierung spart Serverressourcen, aber der Inhalt des Weiterleitungsziels wird nicht angezeigt."
  timeout: "Zeitüberschreitung beim Abrufen der Vorschau (ms)"
  timeoutDescription: "Übersteigt die für die Vorschau benötigte Zeit diesen Wert, wird keine Vorschau generiert."
  maximumContentLength: "Maximale Content-Length (Bytes)"
@@ -3001,3 +3069,121 @@ _search:
  pleaseEnterServerHost: "Gib den Server-Host ein"
  pleaseSelectUser: "Benutzer auswählen"
  serverHostPlaceholder: "Beispiel: misskey.example.com"
+_serverSetupWizard:
+  installCompleted: "Die Installation von Misskey ist abgeschlossen!"
+  firstCreateAccount: "Erstelle zunächst ein Administratorkonto."
+  accountCreated: "Ein Administratorkonto wurde angelegt!"
+  serverSetting: "Servereinstellungen"
+  youCanEasilyConfigureOptimalServerSettingsWithThisWizard: "Mit diesem Assistenten lässt sich die optimale Serverkonfiguration leicht einrichten."
+  settingsYouMakeHereCanBeChangedLater: "Die Einstellungen hier können später geändert werden."
+  howWillYouUseMisskey: "Wie wirst du Misskey verwenden?"
+  _use:
+    single: "Ein-Personen-Server"
+    single_description: "Verwende den Server alleine als deinen eigenen."
+    single_youCanCreateMultipleAccounts: "Bei Bedarf können mehrere Konten eingerichtet werden, auch wenn es sich um einen Ein-Personen-Server handelt."
+    group: "Gruppenserver"
+    group_description: "Lade andere vertrauenswürdige Benutzer ein und verwende es mit mehreren Personen."
+    open: "Offener Server"
+    open_description: "Registrierung für alle öffnen."
+  openServerAdvice: "Die Aufnahme einer unbestimmten Anzahl von Nutzern birgt Risiken. Es wird empfohlen, mit einem zuverlässigen Moderationssystem zu arbeiten, um eventuell auftretende Probleme behandeln zu können."
+  openServerAntiSpamAdvice: "Große Sorgfalt muss auch auf die Sicherheit gelegt werden, z. B. durch die Aktivierung von Anti-Bot-Funktionen wie reCAPTCHA, um sicherzustellen, dass der Server nicht zum Verbreiten von Spam genutzt wird."
+  howManyUsersDoYouExpect: "Mit wie vielen Benutzern rechnest du?"
+  _scale:
+    small: "Weniger als 100 (kleiner Maßstab)"
+    medium: "Mehr als 100 und weniger als 1000 Benutzer (mittelgroß)"
+    large: "Mehr als 1000 (großer Maßstab)"
+  largeScaleServerAdvice: "Für große Server sind unter Umständen fortgeschrittene Kenntnisse erforderlich, z. B. Lastverteilung und Datenbankreplikation."
+  doYouConnectToFediverse: "Mit dem Fediverse verbinden?"
+  doYouConnectToFediverse_description1: "Bei Anschluss an ein Netz von verteilten Servern (Fediverse) können Inhalte mit anderen Servern ausgetauscht werden."
+  doYouConnectToFediverse_description2: "Die Verbindung mit dem Fediverse wird auch als „Föderation“ bezeichnet."
+  youCanConfigureMoreFederationSettingsLater: "Erweiterte Einstellungen, wie z. B. die Angabe von föderierbaren Servern, können später vorgenommen werden."
+  adminInfo: "Administrator-Informationen"
+  adminInfo_description: "Legt die Administrator-Informationen fest, die für den Empfang von Anfragen verwendet werden."
+  adminInfo_mustBeFilled: "Dies ist auf einem offenen Server oder bei aktivierter Föderation erforderlich."
+  followingSettingsAreRecommended: "Die folgenden Einstellungen werden empfohlen"
+  applyTheseSettings: "Diese Einstellungen anwenden"
+  skipSettings: "Konfiguration überspringen"
+  settingsCompleted: "Einrichtung abgeschlossen!"
+  settingsCompleted_description: "Vielen Dank für deine Zeit. Jetzt, wo alles fertig ist, kannst du den Server sofort benutzen."
+  settingsCompleted_description2: "Detaillierte Servereinstellungen können über die „Systemsteuerung“ vorgenommen werden."
+  donationRequest: "Spendenaufruf"
+  _donationRequest:
+    text1: "Misskey ist eine freie Software, die von Freiwilligen entwickelt wird."
+    text2: "Wir würden uns über deine Unterstützung freuen, damit wir dieses Projekt auch in Zukunft weiterentwickeln können."
+    text3: "Für Unterstützer gibt es auch besondere Vorteile!"
+_uploader:
+  editImage: "Bild bearbeiten"
+  compressedToX: "Komprimiert zu {x}"
+  savedXPercent: "{x}% gespart"
+  abortConfirm: "Einige Dateien wurden nicht hochgeladen. Möchtest du den Vorgang abbrechen?"
+  doneConfirm: "Einige Dateien wurden nicht hochgeladen. Möchtest du den Vorgang fortsetzen?"
+  maxFileSizeIsX: "Die maximale Dateigröße, die hochgeladen werden kann, beträgt {x}."
+  allowedTypes: "Hochladbare Dateitypen"
+  tip: "Die Datei ist noch nicht hochgeladen worden. In diesem Dialog kannst du die Datei vor dem Hochladen anzeigen, umbenennen, komprimieren und zuschneiden. Wenn du fertig bist, klicke auf „Hochladen“, um den Upload zu starten."
+_clientPerformanceIssueTip:
+  makeSureDisabledAdBlocker: "Deaktiviere deinen Adblocker"
+  makeSureDisabledAdBlocker_description: "Adblocker können die Leistung beeinträchtigen; vergewissere dich, ob in deinem Betriebssystem, Browser oder deinen Add-ons Adblocker aktiviert sind."
+  makeSureDisabledCustomCss: "Benutzerdefiniertes CSS deaktivieren"
+  makeSureDisabledCustomCss_description: "Das Überschreiben von Stilen kann die Leistung beeinträchtigen. Stelle daher sicher, dass du kein benutzerdefiniertes CSS oder Erweiterungen aktiviert hast, die Stile überschreiben."
+  makeSureDisabledAddons: "Erweiterungen deaktivieren"
+  makeSureDisabledAddons_description: "Einige Erweiterungen können das Verhalten des Clients stören und die Leistung beeinträchtigen. Deaktiviere die Browser-Erweiterungen und prüfe, ob sich die Situation dadurch verbessert."
+_clip:
+  tip: "Clips sind eine Funktion, mit der du Notizen gruppieren kannst."
+_userLists:
+  tip: "Es können Listen mit beliebigen Benutzern erstellt werden. Die erstellte Liste kann als eigene Chronik angezeigt werden."
+watermark: "Wasserzeichen"
+defaultPreset: "Standard-Voreinstellungen"
+_watermarkEditor:
+  tip: "Dem Bild kann ein Wasserzeichen, z. B. eine Quellenangabe, hinzugefügt werden."
+  quitWithoutSaveConfirm: "Nicht gespeicherte Änderungen verwerfen?"
+  driveFileTypeWarn: "Diese Datei wird nicht unterstützt"
+  driveFileTypeWarnDescription: "Bilddatei auswählen"
+  title: "Wasserzeichen bearbeiten"
+  cover: "Alles bedecken"
+  opacity: "Transparenz"
+  scale: "Größe"
+  text: "Text"
+  position: "Position"
+  type: "Art"
+  image: "Bilder"
+  advanced: "Fortgeschritten"
+  stripe: "Streifen"
+  stripeWidth: "Linienbreite"
+  stripeFrequency: "Linienanzahl"
+  angle: "Winkel"
+  polkadot: "Punktmuster"
+  polkadotMainDotOpacity: "Deckkraft des Hauptpunktes"
+  polkadotMainDotRadius: "Größe des Hauptpunktes"
+  polkadotSubDotOpacity: "Deckkraft des Unterpunktes"
+  polkadotSubDotRadius: "Größe des Unterpunktes"
+  polkadotSubDotDivisions: "Anzahl der Unterpunkte"
+_imageEffector:
+  title: "Effekte"
+  addEffect: "Effekte hinzufügen"
+  discardChangesConfirm: "Änderungen verwerfen und beenden?"
+  _fxs:
+    chromaticAberration: "Chromatische Abweichung"
+    glitch: "Glitch"
+    mirror: "Spiegeln"
+    invert: "Farben umkehren"
+    grayscale: "Schwarzweiß"
+    colorAdjust: "Farbkorrektur"
+    colorClamp: "Farbkomprimierung"
+    colorClampAdvanced: "Farbkomprimierung (erweitert)"
+    distort: "Verzerrung"
+    stripe: "Streifen"
+    polkadot: "Punktmuster"
+drafts: "Entwurf"
+_drafts:
+  select: "Entwurf auswählen"
+  cannotCreateDraftAnymore: "Die Anzahl der Entwürfe, die erstellt werden können, wurde überschritten."
+  cannotCreateDraft: "Mit diesem Inhalt kann kein Entwurf erstellt werden."
+  delete: "Entwurf löschen"
+  deleteAreYouSure: "Entwurf löschen?"
+  noDrafts: "Keine Entwürfe"
+  replyTo: "Antwort an {user}"
+  quoteOf: "Zitat von {user}s Notiz"
+  saveToDraft: "Als Entwurf speichern"
+  restoreFromDraft: "Aus Entwurf wiederherstellen"
+  restore: "Wiederherstellen"
+  listDrafts: "Liste der Entwürfe"
@@ -403,3 +403,5 @@ _reversi:
  total: "Σύνολο"
 _search:
  searchScopeLocal: "Τοπικό"
+_watermarkEditor:
+  image: "Εικόνες"
@@ -327,6 +327,7 @@ dark: "Dark"
 lightThemes: "Light themes"
 darkThemes: "Dark themes"
 syncDeviceDarkMode: "Sync Dark Mode with your device settings"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "\"{x}\" is turned on. Would you like to turn off synchronization and switch modes manually?"
 drive: "Drive"
 fileName: "Filename"
 selectFile: "Select a file"
@@ -1301,7 +1302,7 @@ passkeyVerificationSucceededButPasswordlessLoginDisabled: "Passkey verification
 messageToFollower: "Message to followers"
 target: "Target"
 testCaptchaWarning: "This function is intended for CAPTCHA testing purposes.\n<strong>Do not use in a production environment.</strong>"
-prohibitedWordsForNameOfUser: "Prohibited words for user names"
+prohibitedWordsForNameOfUser: "Prohibited words for usernames"
 prohibitedWordsForNameOfUserDescription: "If any of the strings in this list are included in the user's name, the name will be denied. Users with moderator privileges are not affected by this restriction."
 yourNameContainsProhibitedWords: "Your name contains prohibited words"
 yourNameContainsProhibitedWordsDescription: "If you wish to use this name, please contact your server administrator."
@@ -1312,6 +1313,7 @@ availableRoles: "Available roles"
 acknowledgeNotesAndEnable: "Turn on after understanding the precautions."
 federationSpecified: "This server is operated in a whitelist federation. Interacting with servers other than those designated by the administrator is not allowed."
 federationDisabled: "Federation is disabled on this server. You cannot interact with users on other servers."
+draft: "Drafts"
 confirmOnReact: "Confirm when reacting"
 reactAreYouSure: "Would you like to add a \"{emoji}\" reaction?"
 markAsSensitiveConfirm: "Do you want to set this media as sensitive?"
@@ -1329,6 +1331,7 @@ restore: "Restore"
 syncBetweenDevices: "Sync between devices"
 preferenceSyncConflictTitle: "The configured value exists on the server."
 preferenceSyncConflictText: "The sync enabled settings will save their values to the server. However, there are existing values on the server. Which set of values would you like to overwrite?"
+preferenceSyncConflictChoiceMerge: "Merge"
 preferenceSyncConflictChoiceServer: "Configured value on server"
 preferenceSyncConflictChoiceDevice: "Configured value on device"
 preferenceSyncConflictChoiceCancel: "Cancel enabling sync"
@@ -1363,6 +1366,13 @@ abort: "Abort"
 tip: "Tips & Tricks"
 redisplayAllTips: "Show all “Tips & Tricks” again"
 hideAllTips: "Hide all \"Tips & Tricks\""
+defaultImageCompressionLevel: "Default image compression level"
+defaultImageCompressionLevel_description: "Lower level preserves image quality but increases file size.<br>Higher level reduce file size, but reduce image quality."
+inMinutes: "Minute(s)"
+inDays: "Day(s)"
+_order:
+  newest: "Newest First"
+  oldest: "Oldest First"
 _chat:
  noMessagesYet: "No messages yet"
  newMessage: "New message"
@@ -1450,6 +1460,7 @@ _settings:
  contentsUpdateFrequency_description: "The higher the value the more the content updates but it lowers the performance and increases the traffic and memory consumption."
  contentsUpdateFrequency_description2: "When real-time mode is on, content is updated in real time regardless of this setting."
  showUrlPreview: "Show URL preview"
+  showAvailableReactionsFirstInNote: "Show available reactions at the top."
  _chat:
    showSenderName: "Show sender's name"
    sendOnEnter: "Press Enter to send"
@@ -1988,6 +1999,8 @@ _role:
    uploadableFileTypes: "Uploadable file types"
    uploadableFileTypes_caption: "Specifies the allowed MIME/file types. Multiple MIME types can be specified by separating them with a new line, and wildcards can be specified with an asterisk (*). (e.g., image/*)"
    uploadableFileTypes_caption2: "Some files types might fail to be detected. To allow such files, add {x} to the specification."
+    noteDraftLimit: "Number of possible drafts of server notes"
+    watermarkAvailable: "Availability of watermark function"
  _condition:
    roleAssignedTo: "Assigned to manual roles"
    isLocal: "Local user"
@@ -2147,6 +2160,7 @@ _theme:
  install: "Install a theme"
  manage: "Manage themes"
  code: "Theme code"
+  copyThemeCode: "Copy theme code"
  description: "Description"
  installed: "{name} has been installed"
  installedThemes: "Installed themes"
@@ -2460,6 +2474,8 @@ _visibility:
  disableFederation: "Defederate"
  disableFederationDescription: "Don't transmit to other instances"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "There are files that have not been uploaded, do you want to discard them and close the form?"
+  uploaderTip: "The file has not yet been uploaded. From the file menu, you can rename, crop images, watermark and compress or uncompress the file. Files are automatically uploaded when you publish a note."
  replyPlaceholder: "Reply to this note..."
  quotePlaceholder: "Quote this note..."
  channelPlaceholder: "Post to a channel..."
@@ -2793,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "Uploaded at"
  attachedNotes: "Attached notes"
+  usage: "Used"
  thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file."
 _externalResourceInstaller:
  title: "Install from external site"
@@ -2966,7 +2983,7 @@ _customEmojisManager:
      markAsDeleteTargetRanges: "Mark rows in the selection as a target to delete"
      alertUpdateEmojisNothingDescription: "There are no updated Emojis."
      alertDeleteEmojisNothingDescription: "There are no Emojis to be deleted."
-      confirmMovePage: ""
+      confirmMovePage: "Would you like to move pages?"
      confirmChangeView: ""
      confirmUpdateEmojisDescription: "Update {count} Emoji(s). Are you sure to continue?"
      confirmDeleteEmojisDescription: "Delete checked {count} Emoji(s). Are you sure to continue?"
@@ -3096,6 +3113,7 @@ _serverSetupWizard:
    text2: "We would appreciate your support so that we can continue to develop this software further into the future."
    text3: "There are also special benefits for supporters!"
 _uploader:
+  editImage: "Edit Image"
  compressedToX: "Compressed to {x}"
  savedXPercent: "Saving {x}%"
  abortConfirm: "Some files have not been uploaded, do you want to abort?"
@@ -3115,3 +3133,67 @@ _clip:
  tip: "Clip is a feature that allows you to organize your notes."
 _userLists:
  tip: "Lists can contain any user you specify when creating, the created list can then be displayed as a timeline showing only the specified users."
+watermark: "Watermark"
+defaultPreset: "Default Preset"
+_watermarkEditor:
+  tip: "A watermark, such as credit information, can be added to the image."
+  quitWithoutSaveConfirm: "Discard unsaved changes?"
+  driveFileTypeWarn: "This file is not supported"
+  driveFileTypeWarnDescription: "Choose an image file"
+  title: "Edit Watermark"
+  cover: "Cover everything"
+  repeat: "spread all over"
+  opacity: "Opacity"
+  scale: "Size"
+  text: "Text"
+  position: "Position"
+  type: "Type"
+  image: "Images"
+  advanced: "Advanced"
+  stripe: "Stripes"
+  stripeWidth: "Line width"
+  stripeFrequency: "Lines count"
+  angle: "Angle"
+  polkadot: "Polkadot"
+  checker: "Checker"
+  polkadotMainDotOpacity: "Opacity of the main dot"
+  polkadotMainDotRadius: "Size of the main dot"
+  polkadotSubDotOpacity: "Opacity of the secondary dot"
+  polkadotSubDotRadius: "Size of the secondary dot"
+  polkadotSubDotDivisions: "Number of sub-dots."
+_imageEffector:
+  title: "Effects"
+  addEffect: "Add Effects"
+  discardChangesConfirm: "Are you sure you want to leave? You have unsaved changes."
+  _fxs:
+    chromaticAberration: "Chromatic Aberration"
+    glitch: "Glitch"
+    mirror: "Mirror"
+    invert: "Invert Colors"
+    grayscale: "Grayscale"
+    colorAdjust: "Color Correction"
+    colorClamp: "Color Compression"
+    colorClampAdvanced: "Color Compression (Advanced)"
+    distort: "Distortion"
+    threshold: "Binarize"
+    zoomLines: "Saturated lines"
+    stripe: "Stripes"
+    polkadot: "Polkadot"
+    checker: "Checker"
+    blockNoise: "Block Noise"
+    tearing: "Tearing"
+drafts: "Drafts"
+_drafts:
+  select: "Select Draft"
+  cannotCreateDraftAnymore: "The number of drafts that can be created has been exceeded."
+  cannotCreateDraft: "You cannot create a draft with this content."
+  delete: "Delete Draft"
+  deleteAreYouSure: "Delete draft?"
+  noDrafts: "No drafts"
+  replyTo: "Reply to {user}"
+  quoteOf: "Citation to {user}'s note"
+  postTo: "Posting to {channel}"
+  saveToDraft: "Save to Draft"
+  restoreFromDraft: "Restore from Draft"
+  restore: "Restore"
+  listDrafts: "List of Drafts"
@@ -1272,6 +1272,8 @@ pleaseSelectAccount: "Sélectionner un compte"
 availableRoles: "Rôles disponibles"
 postForm: "Formulaire de publication"
 information: "Informations"
+inMinutes: "min"
+inDays: "j"
 _chat:
  invitations: "Inviter"
  noHistory: "Pas d'historique"
@@ -2360,3 +2362,13 @@ _search:
  searchScopeAll: "Tous"
  searchScopeLocal: "Local"
  searchScopeUser: "Spécifier l'utilisateur·rice"
+_watermarkEditor:
+  driveFileTypeWarn: "Ce fichier n'est pas pris en charge"
+  opacity: "Transparence"
+  scale: "Taille"
+  text: "Texte"
+  position: "Position"
+  type: "Type"
+  image: "Images"
+  advanced: "Avancé"
+  angle: "Angle"
@@ -5,9 +5,13 @@ introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersif
 poweredByMisskeyDescription: "{name} adalah sebuah layanan (instance) yang menggunakan platform sumber terbuka <b>Misskey</b>."
 monthAndDay: "{day} {month}"
 search: "Penelusuran"
+reset: "Reset"
 notifications: "Notifikasi"
 username: "Nama Pengguna"
 password: "Kata sandi"
+initialPasswordForSetup: "Kata sandi untuk memulai konfigurasi awal"
+initialPasswordIsIncorrect: "Kata sandi untuk memulai konfigurasi awal salah."
+initialPasswordForSetupDescription: "Jika Anda menginstal Misskey sendiri, gunakan kata sandi yang Anda masukkan di berkas konfigurasi.\nJika Anda menggunakan layanan hosting Misskey, gunakan kata sandi yang diberikan.\nJika Anda belum mengatur kata sandi, biarkan kosong dan lanjutkan."
 forgotPassword: "Lupa Kata Sandi"
 fetchingAsApObject: "Mengambil data dari Fediverse..."
 ok: "OK"
@@ -45,6 +49,7 @@ pin: "Sematkan ke profil"
 unpin: "Lepas sematan dari profil"
 copyContent: "Salin konten"
 copyLink: "Salin tautan"
+copyRemoteLink: "Salin tautan jarak jauh"
 copyLinkRenote: "Salin tautan renote"
 delete: "Hapus"
 deleteAndEdit: "Hapus dan sunting"
@@ -212,8 +217,10 @@ perDay: "per Hari"
 stopActivityDelivery: "Berhenti mengirim aktivitas"
 blockThisInstance: "Blokir instansi ini"
 silenceThisInstance: "Senyapkan instansi ini"
+mediaSilenceThisInstance: "Server media senyap"
 operations: "Tindakan"
 software: "Perangkat lunak"
+softwareName: "Nama Perangkat Lunak"
 version: "Versi"
 metadata: "Metadata"
 withNFiles: "{n} berkas"
@@ -1040,7 +1047,7 @@ disableFederationConfirmWarn: "Mematikan federasi tidak membuat kiriman menjadi
 disableFederationOk: "Matikan federasi"
 invitationRequiredToRegister: "Instansi ini dalam mode undangan-saja. Kamu harus memasukkan kode undangan yang valid untuk mendaftar."
 emailNotSupported: "Instansi ini tidak mendukung mengirim surel"
-postToTheChannel: "Catat ke kanal"
+postToTheChannel: "Buat Catatan ke Kanal"
 cannotBeChangedLater: "Hal ini nantinya tidak dapat diubah lagi."
 reactionAcceptance: "Penerimaan reaksi"
 likeOnly: "Hanya suka"
@@ -1256,6 +1263,8 @@ thereAreNChanges: "Ada {n} perubahan"
 prohibitedWordsForNameOfUser: "Kata yang dilarang untuk nama pengguna"
 postForm: "Buat catatan"
 information: "Informasi"
+inMinutes: "menit"
+inDays: "hari"
 _chat:
  invitations: "Undang"
  noHistory: "Tidak ada riwayat"
@@ -2400,7 +2409,7 @@ _deck:
    main: "Utama"
    widgets: "Widget"
    notifications: "Notifikasi"
-    tl: "Lini masa"
+    tl: "Beranda"
    antenna: "Antena"
    list: "Daftar"
    channel: "Kanal"
@@ -2608,3 +2617,13 @@ _search:
  searchScopeAll: "Semua"
  searchScopeLocal: "Lokal"
  searchScopeUser: "Pengguna spesifik"
+_watermarkEditor:
+  driveFileTypeWarn: "Berkas ini tidak didukung"
+  opacity: "Opasitas"
+  scale: "Ukuran"
+  text: "Teks"
+  position: "Posisi"
+  type: "Tipe"
+  image: "Gambar"
+  advanced: "Tingkat lanjut"
+  angle: "Sudut"
@@ -315,11 +315,11 @@ export interface Locale extends ILocale {
     */
    "mention": string;
    /**
-     * あなた宛て
+     * メンション
     */
    "mentions": string;
    /**
-     * ダイレクト投稿
+     * 指名
     */
    "directNotes": string;
    /**
@@ -2567,11 +2567,11 @@ export interface Locale extends ILocale {
     */
    "serviceworkerInfo": string;
    /**
-     * 削除された投稿
+     * 削除されたノート
     */
    "deletedNote": string;
    /**
-     * 非公開の投稿
+     * 非公開のノート
     */
    "invisibleNote": string;
    /**
@@ -5231,7 +5231,7 @@ export interface Locale extends ILocale {
     */
    "prohibitedWordsForNameOfUser": string;
    /**
-     * このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。
+     * このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。ユーザー名(username)に対しても全て小文字に置き換えて検査します。
     */
    "prohibitedWordsForNameOfUserDescription": string;
    /**
@@ -5270,6 +5270,10 @@ export interface Locale extends ILocale {
     * このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。
     */
    "federationDisabled": string;
+    /**
+     * 下書き
+     */
+    "draft": string;
    /**
     * リアクションする際に確認する
     */
@@ -5335,15 +5339,19 @@ export interface Locale extends ILocale {
     */
    "preferenceSyncConflictTitle": string;
    /**
-     * 同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どちらの設定値で上書きしますか？
+     * 同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どうしますか？
     */
    "preferenceSyncConflictText": string;
    /**
-     * サーバーの設定値
+     * 統合する
+     */
+    "preferenceSyncConflictChoiceMerge": string;
+    /**
+     * サーバーの設定値で上書き
     */
    "preferenceSyncConflictChoiceServer": string;
    /**
-     * デバイスの設定値
+     * デバイスの設定値で上書き
     */
    "preferenceSyncConflictChoiceDevice": string;
    /**
@@ -5477,6 +5485,48 @@ export interface Locale extends ILocale {
     * 全ての「ヒントとコツ」を非表示
     */
    "hideAllTips": string;
+    /**
+     * デフォルトの画像圧縮度
+     */
+    "defaultImageCompressionLevel": string;
+    /**
+     * 低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。
+     */
+    "defaultImageCompressionLevel_description": string;
+    /**
+     * 分
+     */
+    "inMinutes": string;
+    /**
+     * 日
+     */
+    "inDays": string;
+    /**
+     * セーフモードが有効です
+     */
+    "safeModeEnabled": string;
+    /**
+     * セーフモードが有効なため、プラグインはすべて無効化されています。
+     */
+    "pluginsAreDisabledBecauseSafeMode": string;
+    /**
+     * セーフモードが有効なため、カスタムCSSは適用されていません。
+     */
+    "customCssIsDisabledBecauseSafeMode": string;
+    /**
+     * セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。
+     */
+    "themeIsDefaultBecauseSafeMode": string;
+    "_order": {
+        /**
+         * 新しい順
+         */
+        "newest": string;
+        /**
+         * 古い順
+         */
+        "oldest": string;
+    };
    "_chat": {
        /**
         * まだメッセージはありません
@@ -5817,6 +5867,10 @@ export interface Locale extends ILocale {
         * URLプレビューを表示する
         */
        "showUrlPreview": string;
+        /**
+         * 利用できるリアクションを先頭に表示
+         */
+        "showAvailableReactionsFirstInNote": string;
        "_chat": {
            /**
             * 送信者の名前を表示
@@ -6299,7 +6353,7 @@ export interface Locale extends ILocale {
                 */
                "followers": string;
                /**
-                 * 指定したユーザーにのみ公開され、また相手に通知が入ります。ダイレクトメッセージのかわりにお使いいただけます。
+                 * 指定したユーザーにのみ公開され、また相手に通知が入ります。
                 */
                "direct": string;
                /**
@@ -6307,7 +6361,7 @@ export interface Locale extends ILocale {
                 */
                "doNotSendConfidencialOnDirect1": string;
                /**
-                 * 送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーにダイレクト投稿を送信する場合は、機密情報の扱いに注意が必要です。
+                 * 送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーが含まれる限定公開のノートを作成する際は、機密情報の扱いに注意が必要です。
                 */
                "doNotSendConfidencialOnDirect2": string;
                /**
@@ -6456,6 +6510,22 @@ export interface Locale extends ILocale {
         * 有効にすると、リアクション作成時のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。
         */
        "reactionsBufferingDescription": string;
+        /**
+         * リモート投稿の自動クリーニング
+         */
+        "remoteNotesCleaning": string;
+        /**
+         * 有効にすると、参照されていない古いリモートの投稿を定期的にクリーンアップしてデータベースの肥大化を抑制します。
+         */
+        "remoteNotesCleaning_description": string;
+        /**
+         * 最大クリーニング処理継続時間
+         */
+        "remoteNotesCleaningMaxProcessingDuration": string;
+        /**
+         * 最低ノート保持日数
+         */
+        "remoteNotesCleaningExpiryDaysForEachNotes": string;
        /**
         * 問い合わせ先URL
         */
@@ -6528,6 +6598,14 @@ export interface Locale extends ILocale {
         * サーバーで受信したリモートのコンテンツを含め、サーバー内の全てのコンテンツを無条件でインターネットに公開することはリスクが伴います。特に、分散型の特性を知らない閲覧者にとっては、リモートのコンテンツであってもサーバー内で作成されたコンテンツであると誤って認識してしまう可能性があるため、注意が必要です。
         */
        "userGeneratedContentsVisibilityForVisitor_description2": string;
+        /**
+         * サーバーの初期設定ウィザードをやり直しますか？
+         */
+        "restartServerSetupWizardConfirm_title": string;
+        /**
+         * 現在の一部の設定はリセットされます。
+         */
+        "restartServerSetupWizardConfirm_text": string;
        "_userGeneratedContentsVisibilityForVisitor": {
            /**
             * 全て公開
@@ -7761,6 +7839,14 @@ export interface Locale extends ILocale {
             * ファイルによっては種別を判定できないことがあります。そのようなファイルを許可する場合は {x} を指定に追加してください。
             */
            "uploadableFileTypes_caption2": ParameterizedString<"x">;
+            /**
+             * サーバーサイドのノートの下書きの作成可能数
+             */
+            "noteDraftLimit": string;
+            /**
+             * ウォーターマーク機能の使用可否
+             */
+            "watermarkAvailable": string;
        };
        "_condition": {
            /**
@@ -8350,6 +8436,10 @@ export interface Locale extends ILocale {
         * テーマコード
         */
        "code": string;
+        /**
+         * テーマコードをコピー
+         */
+        "copyThemeCode": string;
        /**
         * 説明
         */
@@ -9551,7 +9641,7 @@ export interface Locale extends ILocale {
         */
        "followersDescription": string;
        /**
-         * ダイレクト
+         * 指名
         */
        "specified": string;
        /**
@@ -9568,6 +9658,14 @@ export interface Locale extends ILocale {
        "disableFederationDescription": string;
    };
    "_postForm": {
+        /**
+         * アップロードされていないファイルがありますが、破棄してフォームを閉じますか？
+         */
+        "quitInspiteOfThereAreUnuploadedFilesConfirm": string;
+        /**
+         * ファイルはまだアップロードされていません。ファイルのメニューから、リネームや画像のクロップ、ウォーターマークの付与、圧縮の有無などを設定できます。ファイルはノート投稿時に自動でアップロードされます。
+         */
+        "uploaderTip": string;
        /**
         * このノートに返信...
         */
@@ -10432,11 +10530,11 @@ export interface Locale extends ILocale {
             */
            "channel": string;
            /**
-             * あなた宛て
+             * メンション
             */
            "mentions": string;
            /**
-             * ダイレクト
+             * 指名
             */
            "direct": string;
            /**
@@ -10844,6 +10942,10 @@ export interface Locale extends ILocale {
         * 添付されているノート
         */
        "attachedNotes": string;
+        /**
+         * 利用
+         */
+        "usage": string;
        /**
         * このページは、このファイルをアップロードしたユーザーしか閲覧できません。
         */
@@ -11753,6 +11855,10 @@ export interface Locale extends ILocale {
         * 修復ツールを起動
         */
        "otherOption3": string;
+        /**
+         * Misskeyをセーフモードで起動
+         */
+        "otherOption4": string;
    };
    "_search": {
        /**
@@ -11889,6 +11995,14 @@ export interface Locale extends ILocale {
         * 連合可能なサーバーの指定など、高度な設定も後ほど可能です。
         */
        "youCanConfigureMoreFederationSettingsLater": string;
+        /**
+         * 受信コンテンツの自動クリーニング
+         */
+        "remoteContentsCleaning": string;
+        /**
+         * 連合を行うと、継続して多くのコンテンツを受信します。自動クリーニングを有効にすると、参照されていない古くなったコンテンツを自動でサーバーから削除し、ストレージを節約できます。
+         */
+        "remoteContentsCleaning_description": string;
        /**
         * 管理者情報
         */
@@ -11945,6 +12059,10 @@ export interface Locale extends ILocale {
        };
    };
    "_uploader": {
+        /**
+         * 画像の編集
+         */
+        "editImage": string;
        /**
         * {x}に圧縮
         */
@@ -12016,6 +12134,254 @@ export interface Locale extends ILocale {
         */
        "tip": string;
    };
+    /**
+     * ウォーターマーク
+     */
+    "watermark": string;
+    /**
+     * デフォルトのプリセット
+     */
+    "defaultPreset": string;
+    "_watermarkEditor": {
+        /**
+         * 画像にクレジット情報などのウォーターマークを追加することができます。
+         */
+        "tip": string;
+        /**
+         * 保存せずに終了しますか？
+         */
+        "quitWithoutSaveConfirm": string;
+        /**
+         * このファイルは対応していません
+         */
+        "driveFileTypeWarn": string;
+        /**
+         * 画像ファイルを選択してください
+         */
+        "driveFileTypeWarnDescription": string;
+        /**
+         * ウォーターマークの編集
+         */
+        "title": string;
+        /**
+         * 全体に被せる
+         */
+        "cover": string;
+        /**
+         * 敷き詰める
+         */
+        "repeat": string;
+        /**
+         * 不透明度
+         */
+        "opacity": string;
+        /**
+         * サイズ
+         */
+        "scale": string;
+        /**
+         * テキスト
+         */
+        "text": string;
+        /**
+         * 位置
+         */
+        "position": string;
+        /**
+         * タイプ
+         */
+        "type": string;
+        /**
+         * 画像
+         */
+        "image": string;
+        /**
+         * 高度
+         */
+        "advanced": string;
+        /**
+         * ストライプ
+         */
+        "stripe": string;
+        /**
+         * ラインの幅
+         */
+        "stripeWidth": string;
+        /**
+         * ラインの数
+         */
+        "stripeFrequency": string;
+        /**
+         * 角度
+         */
+        "angle": string;
+        /**
+         * ポルカドット
+         */
+        "polkadot": string;
+        /**
+         * チェッカー
+         */
+        "checker": string;
+        /**
+         * メインドットの不透明度
+         */
+        "polkadotMainDotOpacity": string;
+        /**
+         * メインドットの大きさ
+         */
+        "polkadotMainDotRadius": string;
+        /**
+         * サブドットの不透明度
+         */
+        "polkadotSubDotOpacity": string;
+        /**
+         * サブドットの大きさ
+         */
+        "polkadotSubDotRadius": string;
+        /**
+         * サブドットの数
+         */
+        "polkadotSubDotDivisions": string;
+    };
+    "_imageEffector": {
+        /**
+         * エフェクト
+         */
+        "title": string;
+        /**
+         * エフェクトを追加
+         */
+        "addEffect": string;
+        /**
+         * 変更を破棄して終了しますか？
+         */
+        "discardChangesConfirm": string;
+        "_fxs": {
+            /**
+             * 色収差
+             */
+            "chromaticAberration": string;
+            /**
+             * グリッチ
+             */
+            "glitch": string;
+            /**
+             * ミラー
+             */
+            "mirror": string;
+            /**
+             * 色の反転
+             */
+            "invert": string;
+            /**
+             * 白黒
+             */
+            "grayscale": string;
+            /**
+             * 色調補正
+             */
+            "colorAdjust": string;
+            /**
+             * 色の圧縮
+             */
+            "colorClamp": string;
+            /**
+             * 色の圧縮(高度)
+             */
+            "colorClampAdvanced": string;
+            /**
+             * 歪み
+             */
+            "distort": string;
+            /**
+             * 二値化
+             */
+            "threshold": string;
+            /**
+             * 集中線
+             */
+            "zoomLines": string;
+            /**
+             * ストライプ
+             */
+            "stripe": string;
+            /**
+             * ポルカドット
+             */
+            "polkadot": string;
+            /**
+             * チェッカー
+             */
+            "checker": string;
+            /**
+             * ブロックノイズ
+             */
+            "blockNoise": string;
+            /**
+             * ティアリング
+             */
+            "tearing": string;
+        };
+    };
+    /**
+     * 下書き
+     */
+    "drafts": string;
+    "_drafts": {
+        /**
+         * 下書きを選択
+         */
+        "select": string;
+        /**
+         * 下書きの作成可能数を超えています。
+         */
+        "cannotCreateDraftAnymore": string;
+        /**
+         * この内容では下書きを作成できません。
+         */
+        "cannotCreateDraft": string;
+        /**
+         * 下書きを削除
+         */
+        "delete": string;
+        /**
+         * 下書きを削除しますか？
+         */
+        "deleteAreYouSure": string;
+        /**
+         * 下書きはありません
+         */
+        "noDrafts": string;
+        /**
+         * {user}への返信
+         */
+        "replyTo": ParameterizedString<"user">;
+        /**
+         * {user}のノートへの引用
+         */
+        "quoteOf": ParameterizedString<"user">;
+        /**
+         * {channel}への投稿
+         */
+        "postTo": ParameterizedString<"channel">;
+        /**
+         * 下書きへ保存
+         */
+        "saveToDraft": string;
+        /**
+         * 下書きから復元
+         */
+        "restoreFromDraft": string;
+        /**
+         * 復元
+         */
+        "restore": string;
+        /**
+         * 下書き一覧
+         */
+        "listDrafts": string;
+    };
 }
 declare const locales: {
    [lang: string]: Locale;
@@ -327,6 +327,7 @@ dark: "Scuro"
 lightThemes: "Tema Chiaro"
 darkThemes: "Tema Scuro"
 syncDeviceDarkMode: "Sincronizza il tema scuro con le impostazioni del dispositivo"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "({x}) è attiva. Vuoi disattivare la sincronizzazione e passare alla modalità manuale?"
 drive: "Drive"
 fileName: "Nome dell'allegato"
 selectFile: "Scelta allegato"
@@ -581,7 +582,7 @@ sounds: "Impostazioni suoni"
 sound: "Suono"
 notificationSoundSettings: "Preferenze di notifica"
 listen: "Ascolta"
-none: "Nessuno"
+none: "Nessuna"
 showInPage: "Visualizza in pagina"
 popout: "Finestra pop-out"
 volume: "Volume"
@@ -1312,6 +1313,7 @@ availableRoles: "Ruoli disponibili"
 acknowledgeNotesAndEnable: "Attivare dopo averne compreso il comportamento."
 federationSpecified: "Questo server è federato solo con istanze specifiche del Fediverso. Puoi interagire solo con quelle scelte dall'amministrazione."
 federationDisabled: "Questo server ha la federazione disabilitata. Non puoi interagire con profili provenienti da altri server."
+draft: "Bozza"
 confirmOnReact: "Confermare le reazioni"
 reactAreYouSure: "Vuoi davvero reagire con {emoji} ?"
 markAsSensitiveConfirm: "Vuoi davvero indicare questo contenuto multimediale come esplicito?"
@@ -1329,6 +1331,7 @@ restore: "Ripristina"
 syncBetweenDevices: "Sincronizzazione tra i dispositivi"
 preferenceSyncConflictTitle: "Sul server esiste già il valore impostato"
 preferenceSyncConflictText: "Le impostazione sincronizzata salverà il valore sul server. Però, bada che esiste già un valore sul server. Quale vorresti sovrascrivere?"
+preferenceSyncConflictChoiceMerge: "Integra"
 preferenceSyncConflictChoiceServer: "Valore del server"
 preferenceSyncConflictChoiceDevice: "Valore del dispositivo"
 preferenceSyncConflictChoiceCancel: "Annulla la sincronizzazione"
@@ -1340,7 +1343,7 @@ information: "Informazioni"
 chat: "Chat"
 migrateOldSettings: "Migrare le vecchie impostazioni"
 migrateOldSettings_description: "Di solito, viene fatto automaticamente. Se per qualche motivo non fossero migrate con successo, è possibile avviare il processo di migrazione manualmente, sovrascrivendo le configurazioni attuali."
-compress: "Comprimi"
+compress: "Compressione"
 right: "Destra"
 bottom: "Sotto"
 top: "Sopra"
@@ -1349,6 +1352,7 @@ settingsMigrating: "Migrazione delle impostazioni. Attendere prego ... (Puoi anc
 readonly: "Sola lettura"
 goToDeck: "Torna al Deck"
 federationJobs: "Coda di federazione"
+driveAboutTip: "Il Drive mostra l'elenco di file caricati in passato. Puoi organizzarli in cartelle, riusarli allegandoli ad altre note, o caricarli in anticipo e poi pubblicarli in un secondo momento. Tieni presente che se elimini un file, non sarà più visibile in nessuno degli oggetti a cui è allegato (Note, pagine, avatar, banner, ecc.)"
 scrollToClose: "Scorri per chiudere"
 advice: "Consiglio"
 realtimeMode: "Modalità in tempo reale"
@@ -1362,6 +1366,13 @@ abort: "Annulla"
 tip: "Suggerimento"
 redisplayAllTips: "Mostra tutti i suggerimenti"
 hideAllTips: "Nascondi tutti i suggerimenti"
+defaultImageCompressionLevel: "Livello predefinito di compressione immagini"
+defaultImageCompressionLevel_description: "La compressione diminuisce la qualità dell'immagine, poca compressione mantiene alta qualità delle immagini. Aumentandola, si riducono le dimensioni del file, a discapito della qualità dell'immagine."
+inMinutes: "min"
+inDays: "giorni"
+_order:
+  newest: "Prima i più recenti"
+  oldest: "Meno recenti prima"
 _chat:
  noMessagesYet: "Ancora nessun messaggio"
  newMessage: "Nuovo messaggio"
@@ -1449,6 +1460,7 @@ _settings:
  contentsUpdateFrequency_description: "Se l'impostazione è alta, verranno aggiornati più frequentemente, consumando più dati e più batteria."
  contentsUpdateFrequency_description2: "Quando la modalità è in tempo reale, arriveranno a prescindere."
  showUrlPreview: "Mostra anteprima dell'URL"
+  showAvailableReactionsFirstInNote: "Mostra le reazioni disponibili in alto"
  _chat:
    showSenderName: "Mostra il nome del mittente"
    sendOnEnter: "Invio spedisce"
@@ -1987,6 +1999,8 @@ _role:
    uploadableFileTypes: "Tipi di file caricabili"
    uploadableFileTypes_caption: "Specifica il tipo MIME. Puoi specificare più valori separandoli andando a capo, oppure indicare caratteri jolly con un asterisco (*). Ad esempio: image/*"
    uploadableFileTypes_caption2: "A seconda del file, il tipo potrebbe non essere determinato. Se si desidera consentire tali file, aggiungere {x} alla specifica."
+    noteDraftLimit: "Numero massimo di Note in bozza, lato server"
+    watermarkAvailable: "Disponibilità della funzione filigrana"
  _condition:
    roleAssignedTo: "Assegnato a ruoli manualmente"
    isLocal: "Profilo locale"
@@ -2146,6 +2160,7 @@ _theme:
  install: "Installa un tema"
  manage: "Gestione dei temi"
  code: "Codice tema"
+  copyThemeCode: "Copia il codice del Tema"
  description: "Descrizione"
  installed: "{name} è installato"
  installedThemes: "Temi installati"
@@ -2459,6 +2474,8 @@ _visibility:
  disableFederation: "Senza federazione"
  disableFederationDescription: "Non spedire attività alle altre istanze remote"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "Alcuni file non sono stati caricati. Vuoi annullare l'operazione?"
+  uploaderTip: "Il file non è ancora stato caricato. Nel menu file (tre puntini), puoi ritagliare l'immagine, mettere la filigrana, decidere la presenza o l'assenza di compressione... Il file verrà caricato automaticamente quando pubblichi la Nota."
  replyPlaceholder: "Rispondi a questa nota..."
  quotePlaceholder: "Cita questa nota..."
  channelPlaceholder: "Pubblica sul canale..."
@@ -2792,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "Caricato il"
  attachedNotes: "Note a cui è allegato"
+  usage: "In uso"
  thisPageCanBeSeenFromTheAuthor: "Questa pagina può essere vista solo da chi ha caricato il file."
 _externalResourceInstaller:
  title: "Installa da sito esterno"
@@ -2902,6 +2920,8 @@ _offlineScreen:
 _urlPreviewSetting:
  title: "Impostazioni per l'anteprima delle URL"
  enable: "Attiva l'anteprima delle URL"
+  allowRedirect: "Segui i reindirizzamenti per visualizzare le anteprime"
+  allowRedirectDescription: "Se la URL inserita contiene un reindirizzamento, decidi di seguire il reindirizzamento fino alla destinazione, visualizzandone l'anteprima. Disabilitando questa opzione si risparmiano risorse del server, ma il contenuto effettivo dal reindirizzamento, non verrà visualizzato."
  timeout: "Timeout dell'anteprima in millisecondi"
  timeoutDescription: "Impegna al massimo il tempo indicato, altrimenti ignora l'anteprima"
  maximumContentLength: "Grandezza del contenuto (Content-Length in byte)"
@@ -3093,6 +3113,7 @@ _serverSetupWizard:
    text2: "Se puoi, ti preghiamo di prendere in considerazione l'idea di fare una donazione, così potremo continuare a sviluppare."
    text3: "Sono previsti anche dei vantaggi speciali per i sostenitori!"
 _uploader:
+  editImage: "Modifica immagine"
  compressedToX: "Compresso in {x}"
  savedXPercent: "{x}% risparmiati"
  abortConfirm: "Alcuni file non sono stati caricati. Vuoi annullare l'operazione?"
@@ -3112,3 +3133,67 @@ _clip:
  tip: "Le clip sono una funzionalità che consente di raggruppare le Note."
 _userLists:
  tip: "Puoi creare un elenco di Note create da qualsiasi profilo. L'elenco è visualizzato come una sequenza temporale."
+watermark: "Filigrana"
+defaultPreset: "Impostazioni predefinite"
+_watermarkEditor:
+  tip: "Puoi aggiungere una filigrana, ad esempio con i crediti alle tue immagini."
+  quitWithoutSaveConfirm: "Uscire senza salvare?"
+  driveFileTypeWarn: "Formato file non supportato"
+  driveFileTypeWarnDescription: "Per favore seleziona un file immagine"
+  title: "Modifica la filigrana"
+  cover: "Coprire tutto"
+  repeat: "Disposizione"
+  opacity: "Opacità"
+  scale: "Dimensioni"
+  text: "Testo"
+  position: "Posizione"
+  type: "Tipo"
+  image: "Immagini"
+  advanced: "Avanzato"
+  stripe: "Strisce"
+  stripeWidth: "Larghezza della linea"
+  stripeFrequency: "Il numero di linee"
+  angle: "Angolo"
+  polkadot: "A pallini"
+  checker: "revisore"
+  polkadotMainDotOpacity: "Opacità del punto principale"
+  polkadotMainDotRadius: "Dimensione del punto principale"
+  polkadotSubDotOpacity: "Opacità del punto secondario"
+  polkadotSubDotRadius: "Dimensione del punto secondario"
+  polkadotSubDotDivisions: "Quantità di punti secondari"
+_imageEffector:
+  title: "Effetto"
+  addEffect: "Aggiungi effetto"
+  discardChangesConfirm: "Scarta le modifiche ed esci?"
+  _fxs:
+    chromaticAberration: "Aberrazione cromatica"
+    glitch: "Glitch"
+    mirror: "Specchio"
+    invert: "Inversione colore"
+    grayscale: "Bianco e nero"
+    colorAdjust: "Correzione Colore"
+    colorClamp: "Compressione del colore"
+    colorClampAdvanced: "Compressione del colore (avanzata)"
+    distort: "Distorsione"
+    threshold: "Soglia"
+    zoomLines: "Linea di saturazione"
+    stripe: "Strisce"
+    polkadot: "A pallini"
+    checker: "revisore"
+    blockNoise: "Attenua rumore"
+    tearing: "Strappa immagine"
+drafts: "Bozza"
+_drafts:
+  select: "Selezionare bozza"
+  cannotCreateDraftAnymore: "Hai superato il numero massimo di bozze ammissibili."
+  cannotCreateDraft: "Impossibile creare una bozza di questo contenuto."
+  delete: "Elimina bozza"
+  deleteAreYouSure: "Vuoi davvero eliminare la bozza?"
+  noDrafts: "Non c'è nessuna bozza."
+  replyTo: "Rispondere a {user}"
+  quoteOf: "Citare la nota di {user}"
+  postTo: "Inserire in {channel}"
+  saveToDraft: "Salva come bozza"
+  restoreFromDraft: "Recuperare dalle bozze"
+  restore: "Ripristina"
+  listDrafts: "Elenco bozze"
@@ -74,8 +74,8 @@ youGotNewFollower: "フォローされました"
 receiveFollowRequest: "フォローリクエストされました"
 followRequestAccepted: "フォローが承認されました"
 mention: "メンション"
-mentions: "あなた宛て"
-directNotes: "ダイレクト投稿"
+mentions: "メンション"
+directNotes: "指名"
 importAndExport: "インポートとエクスポート"
 import: "インポート"
 export: "エクスポート"
@@ -637,8 +637,8 @@ addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
 addedRelays: "追加済みのリレー"
 serviceworkerInfo: "プッシュ通知を行うには有効にする必要があります。"
-deletedNote: "削除された投稿"
-invisibleNote: "非公開の投稿"
+deletedNote: "削除されたノート"
+invisibleNote: "非公開のノート"
 enableInfiniteScroll: "自動でもっと見る"
 visibility: "公開範囲"
 poll: "アンケート"
@@ -1303,7 +1303,7 @@ messageToFollower: "フォロワーへのメッセージ"
 target: "対象"
 testCaptchaWarning: "CAPTCHAのテストを目的とした機能です。<strong>本番環境で使用しないでください。</strong>"
 prohibitedWordsForNameOfUser: "禁止ワード（ユーザーの名前）"
-prohibitedWordsForNameOfUserDescription: "このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。"
+prohibitedWordsForNameOfUserDescription: "このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。ユーザー名(username)に対しても全て小文字に置き換えて検査します。"
 yourNameContainsProhibitedWords: "変更しようとした名前に禁止された文字列が含まれています"
 yourNameContainsProhibitedWordsDescription: "名前に禁止されている文字列が含まれています。この名前を使用したい場合は、サーバー管理者にお問い合わせください。"
 thisContentsAreMarkedAsSigninRequiredByAuthor: "投稿者により、表示にはログインが必要と設定されています"
@@ -1313,6 +1313,7 @@ availableRoles: "利用可能なロール"
 acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします。"
 federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
 federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
+draft: "下書き"
 confirmOnReact: "リアクションする際に確認する"
 reactAreYouSure: "\" {emoji} \" をリアクションしますか？"
 markAsSensitiveConfirm: "このメディアをセンシティブとして設定しますか？"
@@ -1329,9 +1330,10 @@ skip: "スキップ"
 restore: "復元"
 syncBetweenDevices: "デバイス間で同期"
 preferenceSyncConflictTitle: "サーバーに設定値が存在します"
-preferenceSyncConflictText: "同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どちらの設定値で上書きしますか？"
-preferenceSyncConflictChoiceServer: "サーバーの設定値"
-preferenceSyncConflictChoiceDevice: "デバイスの設定値"
+preferenceSyncConflictText: "同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どうしますか？"
+preferenceSyncConflictChoiceMerge: "統合する"
+preferenceSyncConflictChoiceServer: "サーバーの設定値で上書き"
+preferenceSyncConflictChoiceDevice: "デバイスの設定値で上書き"
 preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル"
 paste: "ペースト"
 emojiPalette: "絵文字パレット"
@@ -1364,6 +1366,18 @@ abort: "中止"
 tip: "ヒントとコツ"
 redisplayAllTips: "全ての「ヒントとコツ」を再表示"
 hideAllTips: "全ての「ヒントとコツ」を非表示"
+defaultImageCompressionLevel: "デフォルトの画像圧縮度"
+defaultImageCompressionLevel_description: "低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。"
+inMinutes: "分"
+inDays: "日"
+safeModeEnabled: "セーフモードが有効です"
+pluginsAreDisabledBecauseSafeMode: "セーフモードが有効なため、プラグインはすべて無効化されています。"
+customCssIsDisabledBecauseSafeMode: "セーフモードが有効なため、カスタムCSSは適用されていません。"
+themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。"
+
+_order:
+  newest: "新しい順"
+  oldest: "古い順"

 _chat:
  noMessagesYet: "まだメッセージはありません"
@@ -1454,6 +1468,7 @@ _settings:
  contentsUpdateFrequency_description: "高いほどリアルタイムにコンテンツが更新されますが、パフォーマンスが低下し、通信量とバッテリーの消費が多くなります。"
  contentsUpdateFrequency_description2: "リアルタイムモードがオンのときは、この設定に関わらずリアルタイムでコンテンツが更新されます。"
  showUrlPreview: "URLプレビューを表示する"
+  showAvailableReactionsFirstInNote: "利用できるリアクションを先頭に表示"

  _chat:
    showSenderName: "送信者の名前を表示"
@@ -1594,9 +1609,9 @@ _initialTutorial:
      public: "すべてのユーザーに公開。"
      home: "ホームタイムラインのみに公開。フォロワー・プロフィールを見に来た人・リノートから、他のユーザーも見ることができます。"
      followers: "フォロワーにのみ公開。本人以外がリノートすることはできず、またフォロワー以外は閲覧できません。"
-      direct: "指定したユーザーにのみ公開され、また相手に通知が入ります。ダイレクトメッセージのかわりにお使いいただけます。"
+      direct: "指定したユーザーにのみ公開され、また相手に通知が入ります。"
      doNotSendConfidencialOnDirect1: "機密情報は送信する際は注意してください。"
-      doNotSendConfidencialOnDirect2: "送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーにダイレクト投稿を送信する場合は、機密情報の扱いに注意が必要です。"
+      doNotSendConfidencialOnDirect2: "送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーが含まれる限定公開のノートを作成する際は、機密情報の扱いに注意が必要です。"
      localOnly: "他のサーバーに投稿を連合しません。上記の公開範囲に関わらず、他のサーバーのユーザーは、この設定がついたノートを直接閲覧することができなくなります。"
    _cw:
      title: "内容を隠す（CW）"
@@ -1640,6 +1655,10 @@ _serverSettings:
  fanoutTimelineDbFallback: "データベースへのフォールバック"
  fanoutTimelineDbFallbackDescription: "有効にすると、タイムラインがキャッシュされていない場合にDBへ追加で問い合わせを行うフォールバック処理を行います。無効にすると、フォールバック処理を行わないことでさらにサーバーの負荷を軽減することができますが、タイムラインが取得できる範囲に制限が生じます。"
  reactionsBufferingDescription: "有効にすると、リアクション作成時のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。"
+  remoteNotesCleaning: "リモート投稿の自動クリーニング"
+  remoteNotesCleaning_description: "有効にすると、参照されていない古いリモートの投稿を定期的にクリーンアップしてデータベースの肥大化を抑制します。"
+  remoteNotesCleaningMaxProcessingDuration: "最大クリーニング処理継続時間"
+  remoteNotesCleaningExpiryDaysForEachNotes: "最低ノート保持日数"
  inquiryUrl: "問い合わせ先URL"
  inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。"
  openRegistration: "アカウントの作成をオープンにする"
@@ -1658,6 +1677,8 @@ _serverSettings:
  userGeneratedContentsVisibilityForVisitor: "非利用者に対するユーザー作成コンテンツの公開範囲"
  userGeneratedContentsVisibilityForVisitor_description: "モデレーションが行き届きにくい不適切なリモートコンテンツなどが、自サーバー経由で図らずもインターネットに公開されてしまうことによるトラブル防止などに役立ちます。"
  userGeneratedContentsVisibilityForVisitor_description2: "サーバーで受信したリモートのコンテンツを含め、サーバー内の全てのコンテンツを無条件でインターネットに公開することはリスクが伴います。特に、分散型の特性を知らない閲覧者にとっては、リモートのコンテンツであってもサーバー内で作成されたコンテンツであると誤って認識してしまう可能性があるため、注意が必要です。"
+  restartServerSetupWizardConfirm_title: "サーバーの初期設定ウィザードをやり直しますか？"
+  restartServerSetupWizardConfirm_text: "現在の一部の設定はリセットされます。"

  _userGeneratedContentsVisibilityForVisitor:
    all: "全て公開"
@@ -2009,6 +2030,8 @@ _role:
    uploadableFileTypes: "アップロード可能なファイル種別"
    uploadableFileTypes_caption: "MIMEタイプを指定します。改行で区切って複数指定できるほか、アスタリスク(*)でワイルドカード指定できます。(例: image/*)"
    uploadableFileTypes_caption2: "ファイルによっては種別を判定できないことがあります。そのようなファイルを許可する場合は {x} を指定に追加してください。"
+    noteDraftLimit: "サーバーサイドのノートの下書きの作成可能数"
+    watermarkAvailable: "ウォーターマーク機能の使用可否"
  _condition:
    roleAssignedTo: "マニュアルロールにアサイン済み"
    isLocal: "ローカルユーザー"
@@ -2189,6 +2212,7 @@ _theme:
  install: "テーマのインストール"
  manage: "テーマの管理"
  code: "テーマコード"
+  copyThemeCode: "テーマコードをコピー"
  description: "説明"
  installed: "{name}をインストールしました"
  installedThemes: "インストールされたテーマ"
@@ -2512,12 +2536,14 @@ _visibility:
  homeDescription: "ホームタイムラインのみに公開"
  followers: "フォロワー"
  followersDescription: "自分のフォロワーのみに公開"
-  specified: "ダイレクト"
+  specified: "指名"
  specifiedDescription: "指定したユーザーのみに公開"
  disableFederation: "連合なし"
  disableFederationDescription: "他サーバーへの配信を行いません"

 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "アップロードされていないファイルがありますが、破棄してフォームを閉じますか？"
+  uploaderTip: "ファイルはまだアップロードされていません。ファイルのメニューから、リネームや画像のクロップ、ウォーターマークの付与、圧縮の有無などを設定できます。ファイルはノート投稿時に自動でアップロードされます。"
  replyPlaceholder: "このノートに返信..."
  quotePlaceholder: "このノートを引用..."
  channelPlaceholder: "チャンネルに投稿..."
@@ -2756,8 +2782,8 @@ _deck:
    antenna: "アンテナ"
    list: "リスト"
    channel: "チャンネル"
-    mentions: "あなた宛て"
-    direct: "ダイレクト"
+    mentions: "メンション"
+    direct: "指名"
    roleTimeline: "ロールタイムライン"
    chat: "チャット"

@@ -2872,6 +2898,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "追加日"
  attachedNotes: "添付されているノート"
+  usage: "利用"
  thisPageCanBeSeenFromTheAuthor: "このページは、このファイルをアップロードしたユーザーしか閲覧できません。"

 _externalResourceInstaller:
@@ -3141,6 +3168,7 @@ _bootErrors:
  otherOption1: "クライアント設定とキャッシュを削除"
  otherOption2: "簡易クライアントを起動"
  otherOption3: "修復ツールを起動"
+  otherOption4: "Misskeyをセーフモードで起動"

 _search:
  searchScopeAll: "全て"
@@ -3179,6 +3207,8 @@ _serverSetupWizard:
  doYouConnectToFediverse_description1: "分散型サーバーで構成されるネットワーク(Fediverse)に接続すると、他のサーバーと相互にコンテンツのやり取りが可能です。"
  doYouConnectToFediverse_description2: "Fediverseと接続することは「連合」とも呼ばれます。"
  youCanConfigureMoreFederationSettingsLater: "連合可能なサーバーの指定など、高度な設定も後ほど可能です。"
+  remoteContentsCleaning: "受信コンテンツの自動クリーニング"
+  remoteContentsCleaning_description: "連合を行うと、継続して多くのコンテンツを受信します。自動クリーニングを有効にすると、参照されていない古くなったコンテンツを自動でサーバーから削除し、ストレージを節約できます。"
  adminInfo: "管理者情報"
  adminInfo_description: "問い合わせを受け付けるために使用される管理者情報を設定します。"
  adminInfo_mustBeFilled: "オープンサーバー、または連合がオンの場合は必ず入力が必要です。"
@@ -3195,6 +3225,7 @@ _serverSetupWizard:
    text3: "支援者向け特典もあります！"

 _uploader:
+  editImage: "画像の編集"
  compressedToX: "{x}に圧縮"
  savedXPercent: "{x}%節約"
  abortConfirm: "アップロードされていないファイルがありますが、中止しますか？"
@@ -3217,3 +3248,71 @@ _clip:

 _userLists:
  tip: "任意のユーザーが含まれるリストを作成できます。作成したリストはタイムラインとして表示可能です。"
+
+watermark: "ウォーターマーク"
+defaultPreset: "デフォルトのプリセット"
+_watermarkEditor:
+  tip: "画像にクレジット情報などのウォーターマークを追加することができます。"
+  quitWithoutSaveConfirm: "保存せずに終了しますか？"
+  driveFileTypeWarn: "このファイルは対応していません"
+  driveFileTypeWarnDescription: "画像ファイルを選択してください"
+  title: "ウォーターマークの編集"
+  cover: "全体に被せる"
+  repeat: "敷き詰める"
+  opacity: "不透明度"
+  scale: "サイズ"
+  text: "テキスト"
+  position: "位置"
+  type: "タイプ"
+  image: "画像"
+  advanced: "高度"
+  stripe: "ストライプ"
+  stripeWidth: "ラインの幅"
+  stripeFrequency: "ラインの数"
+  angle: "角度"
+  polkadot: "ポルカドット"
+  checker: "チェッカー"
+  polkadotMainDotOpacity: "メインドットの不透明度"
+  polkadotMainDotRadius: "メインドットの大きさ"
+  polkadotSubDotOpacity: "サブドットの不透明度"
+  polkadotSubDotRadius: "サブドットの大きさ"
+  polkadotSubDotDivisions: "サブドットの数"
+
+_imageEffector:
+  title: "エフェクト"
+  addEffect: "エフェクトを追加"
+  discardChangesConfirm: "変更を破棄して終了しますか？"
+
+  _fxs:
+    chromaticAberration: "色収差"
+    glitch: "グリッチ"
+    mirror: "ミラー"
+    invert: "色の反転"
+    grayscale: "白黒"
+    colorAdjust: "色調補正"
+    colorClamp: "色の圧縮"
+    colorClampAdvanced: "色の圧縮(高度)"
+    distort: "歪み"
+    threshold: "二値化"
+    zoomLines: "集中線"
+    stripe: "ストライプ"
+    polkadot: "ポルカドット"
+    checker: "チェッカー"
+    blockNoise: "ブロックノイズ"
+    tearing: "ティアリング"
+
+drafts: "下書き"
+_drafts:
+  select: "下書きを選択"
+  cannotCreateDraftAnymore: "下書きの作成可能数を超えています。"
+  cannotCreateDraft: "この内容では下書きを作成できません。"
+  delete: "下書きを削除"
+  deleteAreYouSure: "下書きを削除しますか？"
+  noDrafts: "下書きはありません"
+  replyTo: "{user}への返信"
+  quoteOf: "{user}のノートへの引用"
+  postTo: "{channel}への投稿"
+  saveToDraft: "下書きへ保存"
+  restoreFromDraft: "下書きから復元"
+  restore: "復元"
+  listDrafts: "下書き一覧"
@@ -300,6 +300,7 @@ uploadFromUrlMayTakeTime: "アップロード終わるんにちょい時間か
 explore: "みつける"
 messageRead: "もう読んだ"
 noMoreHistory: "これより昔のんはあらへんで"
+startChat: "チャットを始めよか"
 nUsersRead: "{n}人が読んでもうた"
 agreeTo: "{0}に同意したで"
 agree: "せやな"
@@ -324,6 +325,7 @@ dark: "ダーク"
 lightThemes: "デイゲーム"
 darkThemes: "ナイトゲーム"
 syncDeviceDarkMode: "デバイスのダークモードと一緒にする"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」がオンになってるで。同期をオフにして手動でモードを切り替えることにします？"
 drive: "ドライブ"
 fileName: "ファイル名"
 selectFile: "ファイル選んでや"
@@ -422,6 +424,7 @@ antennaExcludeBots: "Botアカウントを除外"
 antennaKeywordsDescription: "スペースで区切ったるとAND指定で、改行で区切ったるとOR指定や"
 notifyAntenna: "新しいノートを通知すんで"
 withFileAntenna: "なんか添付されたノートだけ"
+excludeNotesInSensitiveChannel: "センシティブなチャンネルのノートは入れんとくわ"
 enableServiceworker: "ブラウザにプッシュ通知が行くようにする"
 antennaUsersDescription: "ユーザー名を改行で区切ったってな"
 caseSensitive: "大文字と小文字は別もんや"
@@ -693,6 +696,7 @@ userSaysSomethingAbout: "{name}が「{word}」についてなんか言うてた
 makeActive: "使うで"
 display: "表示"
 copy: "コピー"
+copiedToClipboard: "クリップボードにコピーされたで"
 metrics: "メトリクス"
 overview: "概要"
 logs: "ログ"
@@ -787,6 +791,7 @@ wide: "広い"
 narrow: "狭い"
 reloadToApplySetting: "設定はページリロード後に反映されるで。今リロードしとくか？"
 needReloadToApply: "反映には再起動せなあかんで"
+needToRestartServerToApply: "反映にはサーバーを再起動せなあかんのよ。"
 showTitlebar: "タイトルバーを見せる"
 clearCache: "キャッシュをほかす"
 onlineUsersCount: "{n}人が起きとるで"
@@ -974,6 +979,7 @@ document: "ドキュメント"
 numberOfPageCache: "ページ、どんだけキャッシュすんの？"
 numberOfPageCacheDescription: "増やすと使いやすくなるけど、負荷とメモリ使用量が増えてくで。一長一短やな。"
 logoutConfirm: "ログアウトしまっか？"
+logoutWillClearClientData: "ログアウトするとクライアントの設定情報がブラウザから消されてまうで。再ログイン時に設定情報を復元できるようにするためには、設定の自動バックアップを有効にするとええで。"
 lastActiveDate: "最後に使った日時"
 statusbar: "ステータスバー"
 pleaseSelect: "選んだってやー"
@@ -992,6 +998,7 @@ failedToUpload: "アップロードに失敗してもうたわ…"
 cannotUploadBecauseInappropriate: "きわどい内容を含むかもしれへんって言われたからアップロードできへんわ。"
 cannotUploadBecauseNoFreeSpace: "ドライブがもうパンパンやからアップロードできへんわ。"
 cannotUploadBecauseExceedsFileSizeLimit: "ファイルが思うたよりも大きいさかいアップロードできへんでこれ。"
+cannotUploadBecauseUnallowedFileType: "許可されてへんファイル種別やからアップロードできへんっぽい。"
 beta: "ベータ"
 enableAutoSensitive: "自動できわどいか判断する"
 enableAutoSensitiveDescription: "使える時は、機械学習を使って自動でメディアにNSFWフラグを設定するで。この機能をオフにしても、サーバーによっては自動で設定されることがあるで。"
@@ -1304,11 +1311,37 @@ federationSpecified: "このサーバーはホワイトリスト連合で運用
 federationDisabled: "このサーバーは連合が無効化されてるで。他のサーバーのユーザーとやり取りすることはできひんで。"
 confirmOnReact: "ツッコむときに確認とる"
 reactAreYouSure: "\" {emoji} \" でツッコむ？"
+markAsSensitiveConfirm: "このメディアをきわどい扱いしときますか？"
+unmarkAsSensitiveConfirm: "このメディアはやっぱきわどくなかったってことでええんか？"
+noName: "名前はあらへんで"
+preferenceSyncConflictTitle: "サーバーに設定値があるみたいやわ"
+preferenceSyncConflictText: "同期が有効にされた設定項目は設定値をサーバーに保存するねんけど、この設定項目はサーバーに保存されたやつがあるみたいやわ。どないするん？"
+preferenceSyncConflictChoiceMerge: "ガッチャンコしよか"
+preferenceSyncConflictChoiceCancel: "同期の有効化はやめとくわ"
 postForm: "投稿フォーム"
 information: "情報"
+migrateOldSettings: "旧設定情報をお引っ越し"
+migrateOldSettings_description: "通常これは自動で行われるはずなんやけど、なんかの理由で上手く移行できへんかったときは手動で移行処理をポチっとできるで。今の設定情報は上書きされるで。"
+settingsMigrating: "設定を移行しとるで。ちょっと待っとってな... (後で、設定→その他→旧設定情報を移行 で手動で移行することもできるで)"
+driveAboutTip: "ドライブでは、今までアップロードしたファイルがずらーっと表示されるで。<br>\nノートにファイルをもっかいのっけたり、あとで投稿するファイルをその辺に置いとくこともできるねん。<br>\n<b>ファイルをほかすと、前にそのファイルをのっけた全部の場所(ノート、ページ、アバター、バナー等)からも見えんくなるから気いつけてな。</b><br>\nフォルダを作って整理することもできるで。"
+turnItOn: "オンにしとこ"
+turnItOff: "オフでええわ"
+emojiUnmute: "絵文字ミュートやめたる"
+unmuteX: "{x}のミュートやめたる"
+redisplayAllTips: "全部の「ヒントとコツ」をもっかい見して"
+hideAllTips: "「ヒントとコツ」は全部表示せんでええ"
+defaultImageCompressionLevel_description: "低くすると画質は保てるんやけど、ファイルサイズが増えるで。<br>高くするとファイルサイズは減らせるんやけど、画質が落ちるで。"
+inMinutes: "分"
+inDays: "日"
 _chat:
+  noMessagesYet: "まだメッセージはあらへんで"
+  individualChat_description: "特定のユーザーと一対一でチャットができるで。"
+  roomChat_description: "複数人でチャットできるで。\nあと、個人チャットを許可してへんユーザーとでも、相手がええって言うならチャットできるで。"
+  inviteUserToChat: "ユーザーを招待してチャットを始めてみ"
  invitations: "来てや"
+  noInvitations: "招待はあらへんで"
  noHistory: "履歴はないわ。"
+  noRooms: "ルームはあらへんで"
  members: "メンバーはん"
  home: "ホーム"
  send: "送信"
@@ -2617,7 +2650,7 @@ _externalResourceInstaller:
  _errors:
    _invalidParams:
      title: ""
-      description: ""
+      description: "外部サイトからデータを持ってくるのに欲しい情報が足らへんみたいやわ。URLは合っとる？"
    _resourceTypeNotSupported:
      title: ""
      description: ""
@@ -2648,7 +2681,7 @@ _dataSaver:
    title: "アイコンの絵"
    description: "アイコン画像のアニメが止まるで。普通の画像よりもデータ量がでかいから、もっと通信量を節約できるねん。"
  _code:
-    title: "コードハイライト"
+    title: "コードハイライトは表示せんでええ"
    description: "MFMとかでコードハイライト記法が使われてるとき、タップするまで読み込まれへんくなるで。コードハイライトではハイライトする言語ごとにその決めてるファイルを読む必要はあんねんな。けどな、それは自動で読み込まれなくなるから、通信量を少なくできることができるねん。"
 _hemisphere:
  N: "北半球"
@@ -2848,3 +2881,18 @@ _search:
  searchScopeAll: "みんな"
  searchScopeLocal: "ローカル"
  searchScopeUser: "ユーザー指定"
+_watermarkEditor:
+  driveFileTypeWarn: "このファイルは対応しとらへん"
+  opacity: "不透明度"
+  scale: "大きさ"
+  text: "テキスト"
+  position: "位置"
+  type: "タイプ"
+  image: "画像"
+  advanced: "高度"
+  angle: "角度"
+_imageEffector:
+  discardChangesConfirm: "変更をせんで終わるか？"
+_drafts:
+  deleteAreYouSure: "下書きをほかしてもええか？"
+  noDrafts: "下書きはあらへん"
@@ -848,3 +848,5 @@ _remoteLookupErrors:
 _search:
  searchScopeAll: "말캉"
  searchScopeUser: "사용자 지정"
+_watermarkEditor:
+  image: "이미지"
@@ -298,6 +298,7 @@ uploadFromUrl: "URL 업로드"
 uploadFromUrlDescription: "업로드하려는 파일의 URL"
 uploadFromUrlRequested: "업로드를 요청했습니다"
 uploadFromUrlMayTakeTime: "업로드가 완료될 때까지 시간이 소요될 수 있습니다."
+uploadNFiles: "{n}개의 파일을 업로"
 explore: "둘러보기"
 messageRead: "읽음"
 noMoreHistory: "이것보다 과거의 기록이 없습니다"
@@ -326,6 +327,7 @@ dark: "다크"
 lightThemes: "밝은 테마"
 darkThemes: "어두운 테마"
 syncDeviceDarkMode: "디바이스의 다크 모드 설정과 동기화"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "'{x}'가 켜져 있습니다. 동기화를 끄고 수동으로 모드를 변경하겠습니까?"
 drive: "드라이브"
 fileName: "파일명"
 selectFile: "파일 선택"
@@ -575,8 +577,10 @@ showFixedPostForm: "타임라인 상단에 글 입력란을 표시"
 showFixedPostFormInChannel: "채널 타임라인 상단에 글 입력란을 표시"
 withRepliesByDefaultForNewlyFollowed: "팔로우 할 때 기본적으로 답글을 타임라인에 나오게 하기"
 newNoteRecived: "새 노트가 있습니다"
+newNote: "새로운 노트"
 sounds: "소리"
 sound: "소리"
+notificationSoundSettings: "알림 설정"
 listen: "듣기"
 none: "없음"
 showInPage: "페이지로 보기"
@@ -791,6 +795,7 @@ wide: "넓게"
 narrow: "좁게"
 reloadToApplySetting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
 needReloadToApply: "변경 사항은 새로고침하면 적용됩니다."
+needToRestartServerToApply: "변경 사항은 새로고침이 필요합니다."
 showTitlebar: "타이틀 바를 표시하기"
 clearCache: "캐시 비우기"
 onlineUsersCount: "{n}명이 접속 중"
@@ -997,6 +1002,7 @@ failedToUpload: "업로드 실패"
 cannotUploadBecauseInappropriate: "이 파일은 부적절한 내용을 포함한다고 판단되어 업로드할 수 없습니다."
 cannotUploadBecauseNoFreeSpace: "드라이브 용량이 부족하여 업로드할 수 없습니다."
 cannotUploadBecauseExceedsFileSizeLimit: "파일 크기가 너무 크기 때문에 업로드할 수 없습니다."
+cannotUploadBecauseUnallowedFileType: "허가되지 않은 유형의 파일이기에 업로드할 수 없습니다."
 beta: "베타"
 enableAutoSensitive: "자동 NSFW 탐지"
 enableAutoSensitiveDescription: "이용 가능할 경우 기계학습을 통해 자동으로 미디어 NSFW를 설정합니다. 이 기능을 해제하더라도, 서버 정책에 따라 자동으로 설정될 수 있습니다."
@@ -1307,6 +1313,7 @@ availableRoles: "사용 가능한 역할"
 acknowledgeNotesAndEnable: "활성화 하기 전에 주의 사항을 확인했습니다."
 federationSpecified: "이 서버는 화이트 리스트 제도로 운영 중 입니다. 정해진 리모트 서버가 아닌 경우 연합되지 않습니다."
 federationDisabled: "이 서버는 연합을 하지 않고 있습니다. 리모트 서버 유저와 통신을 할 수 없습니다."
+draft: "초안"
 confirmOnReact: "리액션할 때 확인"
 reactAreYouSure: "\" {emoji} \"로 리액션하시겠습니까?"
 markAsSensitiveConfirm: "이 미디어를 민감한 미디어로 설정하시겠습니까?"
@@ -1324,6 +1331,7 @@ restore: "복원"
 syncBetweenDevices: "장치간 동기화"
 preferenceSyncConflictTitle: "서버에 설정값이 존재합니다."
 preferenceSyncConflictText: "동기화를 활성화 한 항목의 설정 값은 서버에 저장되지만, 해당 항목은 이미 서버에 설정 값이 저장되어져 있습니다. 어느 쪽의 설정 값을 덮어씌울까요?"
+preferenceSyncConflictChoiceMerge: "병합"
 preferenceSyncConflictChoiceServer: "서버 설정값"
 preferenceSyncConflictChoiceDevice: "장치 설정값"
 preferenceSyncConflictChoiceCancel: "동기화 취소"
@@ -1346,6 +1354,25 @@ goToDeck: "덱으로 돌아가기"
 federationJobs: "연합 작업"
 driveAboutTip: "드라이브는 이전에 업로드한 파일 목록을 표시해요. <br>\n노트에 첨부할 때 다시 사용하거나 나중에 게시할 파일을 미리 업로드할 수 있어요. <br>\n<b>파일을 삭제하면, 지금까지 그 파일을 사용한 모든 장소(노트, 페이지, 아바타, 배너 등)에서도 보이지 않게 되므로 주의해 주세요. 폴더를 만들고 정리할 수도 있어요.</b><br>"
 scrollToClose: "스크롤하여 닫기"
+advice: "참고"
+realtimeMode: "실시간 모드"
+turnItOn: "켜기"
+turnItOff: "끄기"
+emojiMute: "이모티콘 뮤트"
+emojiUnmute: "이모티콘 뮤트 해제"
+muteX: "{x}를 뮤트"
+unmuteX: "{x}의 뮤트를 해제"
+abort: "중지"
+tip: "팁과 유용한 정보"
+redisplayAllTips: "모든 '팁과 유용한 정보'를 재표시"
+hideAllTips: "모든 '팁과 유용한 정보'를 비표시"
+defaultImageCompressionLevel: "기본 이미지 압축 정도"
+defaultImageCompressionLevel_description: "낮추면 화질을 유지합니다만 파일 크기는 증가합니다. <br>높이면 파일 크기를 줄일 수 있습니다만 화질은 저하됩니다."
+inMinutes: "분"
+inDays: "일"
+_order:
+  newest: "최신 순"
+  oldest: "오래된 순"
 _chat:
  noMessagesYet: "아직 메시지가 없습니다"
  newMessage: "새로운 메시지"
@@ -1379,6 +1406,8 @@ _chat:
  chatNotAvailableInOtherAccount: "상대방 계정에서 채팅 기능을 사용할 수 없는 상태입니다."
  cannotChatWithTheUser: "이 유저와 채팅을 시작할 수 없습니다"
  cannotChatWithTheUser_description: "채팅을 사용할 수 없는 상태이거나 상대방이 채팅을 열지 않은 상태입니다."
+  youAreNotAMemberOfThisRoomButInvited: "당신은 이 룸의 참가자가 아닙니다만 초대 신청을 받으셨습니다. 참가하려면 초대를  수락해주십시오."
+  doYouAcceptInvitation: "초대를 수락하시겠습니까?"
  chatWithThisUser: "채팅하기"
  thisUserAllowsChatOnlyFromFollowers: "이 유저는 팔로워만 채팅을 할 수 있습니다."
  thisUserAllowsChatOnlyFromFollowing: "이 유저는 이 유저가 팔로우하는 유저만 채팅을 허용합니다."
@@ -1418,12 +1447,20 @@ _settings:
  makeEveryTextElementsSelectable: "모든 텍스트 요소를 선택할 수 있도록 함"
  makeEveryTextElementsSelectable_description: "활성화 시, 일부 동작에서 유저의 접근성이 나빠질 수도 있습니다."
  useStickyIcons: "아이콘이 스크롤을 따라가도록 하기"
+  enableHighQualityImagePlaceholders: "고화질 이미지의 플레이스홀더를 표시"
+  uiAnimations: "UI 애니메이션"
  showNavbarSubButtons: "내비게이션 바에 보조 버튼 표시"
  ifOn: "켜져 있을 때"
  ifOff: "꺼져 있을 때"
  enableSyncThemesBetweenDevices: "기기 간 설치한 테마 동기화"
  enablePullToRefresh: "계속해서 갱신"
  enablePullToRefresh_description: "마우스에서 휠을 누르면서 드래그해요."
+  realtimeMode_description: "서버에 접속하고 실시간으로 콘텐츠를 업데이트합니다. 데이터 사용량과 배터리의 소비가 증가할 수 있습니다."
+  contentsUpdateFrequency: "콘텐츠의 업데이트 빈도"
+  contentsUpdateFrequency_description: "높을수록 실시간으로 콘텐츠가 업데이트됩니다만, 성능이 저하되고 데이터 사용량과 배터리의 소비가 증가합니다."
+  contentsUpdateFrequency_description2: "실시간 모드가 켜져 있을 때는 이 설정과 상관없이 실시간으로 콘텐츠가 업데이트됩니다."
+  showUrlPreview: "URL 미리보기 표시"
+  showAvailableReactionsFirstInNote: "이용 가능한 리액션을 선두로 표시"
  _chat:
    showSenderName: "발신자 이름 표시"
    sendOnEnter: "엔터로 보내기"
@@ -1604,6 +1641,21 @@ _serverSettings:
  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "일정 기간동안 모더레이터의 활동이 감지되지 않는 경우, 스팸 방지를 위해 이 설정은 자동으로 꺼집니다."
  deliverSuspendedSoftware: "전달 정지 중인 소프트웨어"
  deliverSuspendedSoftwareDescription: "취약성 등의 이유로 서버의 소프트웨어 이름 및 버전 범위를 지정하여 전달을 정지할 수 있어요. 이 버전 정보는 서버가 제공한 것이며 신뢰성은 보장되지 않아요. 버전 지정에는 semver의 범위 지정을 사용할 수 있지만, >= 2024.3.1로 지정하면 2024.3.1-custom.0과 같은 custom.0과 같은 custom 버전이 포함되지 않기 때문에 >= 2024.3.1-0과 같이 prerelease를 지정하는 것이 좋아요."
+  singleUserMode: "1인 모드"
+  singleUserMode_description: "이 서버의 이용자가 자신 뿐인 경우, 이 모드를 활성화하면 동작이 최적화됩니다."
+  signToActivityPubGet: "GET 요청에 사인"
+  signToActivityPubGet_description: "보통의 경우 활성화해 주십시오. 연합의 통신에 관한 문제가 있는 경우, 비활성화하면 개선되는 경우도 있습니다만, 서버에 따라서는 통신이 불가능해지는 경우도 있습니다."
+  proxyRemoteFiles: "리모트 파일 프록시"
+  proxyRemoteFiles_description: "활성화하면 리모트 파일을 프록시로 제공합니다. 이미지의 섬네일 생성이나 유저의 개인정보 보호에 도움을 줍니다."
+  allowExternalApRedirect: "ActivityPub 경유 조회에 리디렉션 허가"
+  allowExternalApRedirect_description: "활성화하면 다른 서버가 이 서버를 통해 제3자의 콘텐츠를 조회할 수 있습니다만, 콘텐츠의 사칭 문제가 생길 수 있습니다."
+  userGeneratedContentsVisibilityForVisitor: "비이용자에 대한 유저 작성 콘텐츠의 공개 범위"
+  userGeneratedContentsVisibilityForVisitor_description: "조정을 하기 힘든 부적절한 리모트 콘텐츠 등이 자신의 서버 경유로 의도치 않게 인터넷에 공개되는 문제의 방지 등에 도움을 줍니다."
+  userGeneratedContentsVisibilityForVisitor_description2: "서버에서 받은 리모트 콘텐츠를 포함해 서버 내의 모든 콘텐츠를 무조건 인터넷에 공개하는 것에는 위험이 따릅니다. 특히, 분산형 특성에 대해 모르는 열람자에게는 리모트 콘텐츠여도 서버 내에서 작성된 콘텐츠라고 잘못 인식할 수 있기에 주의가 필요합니다."
+  _userGeneratedContentsVisibilityForVisitor:
+    all: "모두 공개"
+    localOnly: "로컬 콘텐츠만 공개하고 리모트 콘텐츠는 비공개"
+    none: "모두 비공개"
 _accountMigration:
  moveFrom: "다른 계정에서 이 계정으로 이사"
  moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1944,6 +1996,11 @@ _role:
    canImportMuting: "뮤트 목록 가져오기 허용"
    canImportUserLists: "리스트 목록 가져오기 허용"
    chatAvailability: "채팅을 허락"
+    uploadableFileTypes: "업로드 가능한 파일 유형"
+    uploadableFileTypes_caption: "MIME 유형을 "
+    uploadableFileTypes_caption2: "파일에 따라서는 유형을 검사하지 못하는 경우가 있습니다. 그러한 파일을 허가하는 경우에는 {x}를 지정으로 추가해주십시오."
+    noteDraftLimit: "서버측 노트 초안 작성 가능 수"
+    watermarkAvailable: "워터마크 기능의 사용 여부"
  _condition:
    roleAssignedTo: "수동 역할에 이미 할당됨"
    isLocal: "로컬 유저"
@@ -2103,6 +2160,7 @@ _theme:
  install: "테마 설치"
  manage: "테마 관리"
  code: "테마 코드"
+  copyThemeCode: "테마 코드 복사"
  description: "설명"
  installed: "{name} 테마가 설치되었습니다"
  installedThemes: "설치된 테마"
@@ -2416,6 +2474,8 @@ _visibility:
  disableFederation: "연합에 보내지 않기"
  disableFederationDescription: "다른 서버로 보내지 않습니다"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "업로드되지 않은 파일이 있습니다만, 없애고 폼을 닫겠습니까?"
+  uploaderTip: "파일이 아직 업로드돼있지 않습니다. 파일 메뉴에서 이름 바꾸기나 이미지의 자르기, 워터마크 넣기, 압축의 유무 등을 설정할 수 있습니다. 파일은 노트 게시 시 자동으로 업로드됩니다."
  replyPlaceholder: "이 노트에 답글..."
  quotePlaceholder: "이 노트를 인용..."
  channelPlaceholder: "채널에 게시하기..."
@@ -2749,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "업로드 날짜"
  attachedNotes: "첨부된 노트"
+  usage: "이용"
  thisPageCanBeSeenFromTheAuthor: "이 페이지는 파일 소유자만 열람할 수 있습니다"
 _externalResourceInstaller:
  title: "외부 사이트로부터 설치"
@@ -2796,6 +2857,12 @@ _dataSaver:
  _avatar:
    title: "아이콘 이미지"
    description: "아이콘 이미지의 애니메이션을 멈춥니다. 애니메이션 이미지는 일반 이미지보다 파일 크기가 클 수 있으므로 데이터 사용량을 더 줄일 수 있습니다."
+  _urlPreviewThumbnail:
+    title: "URL 미리보기의 섬네일을 비표시"
+    description: "URL 미리보기의 섬네일 이미지를 불러올 수 없게 됩니다."
+  _disableUrlPreview:
+    title: "URL 미리보기 비활성화"
+    description: "URL 미리보기 기능을 비활성화합니다. 섬네일 이미지와 달리 링크 정보 불러오기 자체를 줄일 수 있습니다."
  _code:
    title: "문자열 강조"
    description: "MFM 등으로 문자열 강조 기법을 사용할 때 누르기 전에는 불러오지 않습니다. 문자열 강조에서는 강조할 언어마다 그 정의 파일을 불러와야 하지만 이를 자동으로 불러오지 않으므로 데이터 사용량을 줄일 수 있습니다."
@@ -2853,6 +2920,8 @@ _offlineScreen:
 _urlPreviewSetting:
  title: "URL 미리보기 설정"
  enable: "URL 미리보기 활성화"
+  allowRedirect: "미리보기 위치의 리디렉션 허가"
+  allowRedirectDescription: "입력된 URL이 리디렉션될 경우, 그 리디렉션 위치를 따라 미리보기를 표시할 것인지 설정합니다. 비활성화하면 서버 리소스를 절약할 수 있습니다만, 리디렉션 위치의 내용은 표시되지 않습니다."
  timeout: "미리보기를 불러올 때의 타임아웃 (ms)"
  timeoutDescription: "미리보기를 로딩하는데 걸리는 시간이 정한 시간보다 오래 걸리는 경우, 미리보기를 생성하지 않습니다."
  maximumContentLength: "Content-Length의 최대치 (byte)"
@@ -3001,3 +3070,130 @@ _search:
  pleaseEnterServerHost: "서버의 호스트를 입력해 주세요."
  pleaseSelectUser: "유저를 선택해주세요"
  serverHostPlaceholder: "예: misskey.example.com"
+_serverSetupWizard:
+  installCompleted: "Misskey의 설치가 완료됐습니다!"
+  firstCreateAccount: "먼저 관리자 계정을 만듭시다."
+  accountCreated: "관리자 계정이 만들어졌습니다!"
+  serverSetting: "서버 설정"
+  youCanEasilyConfigureOptimalServerSettingsWithThisWizard: "이 위자드로 쉽게 최적화된 서버의 설정을 할 수 있습니다."
+  settingsYouMakeHereCanBeChangedLater: "이 설정은 나중에 변경 가능합니다."
+  howWillYouUseMisskey: "Misskey를 어떻게 사용하십니까?"
+  _use:
+    single: "1인 서버"
+    single_description: "자신 전용 서버로 혼자서 사용"
+    single_youCanCreateMultipleAccounts: "1인 서버로 운영하는 경우에도 계정은 필요에 따라 여러 개 만들 수 있습니다."
+    group: "그룹 서버"
+    group_description: "신뢰 가능한 다른 유저를 초대해 여러 명이 사용"
+    open: "오픈 서버"
+    open_description: "불특정 다수의 유저를 받아들이는 운영을 함"
+  openServerAdvice: "불특정 다수의 유저를 받아들이는 것에는 위험이 따릅니다. 문제에 대처할 수 있도록 확실한 조정 체제로 운영하는 것을 권장합니다."
+  openServerAntiSpamAdvice: "자신의 서버가 스팸으로 사용되지 않게끔 reCAPTCHA라는 안티 봇 기능을 활성화하는 등 보안에 대해서도 세심한 주의가 필요합니다."
+  howManyUsersDoYouExpect: "어느 정도의 인원으로 생각 중이십니까?"
+  _scale:
+    small: "100명 이하(소규모)"
+    medium: "100명 이상 1000명 이하(중간 규모)"
+    large: "1000명 이상(대규모)"
+  largeScaleServerAdvice: "대규모 서버에서는 부하분산이나 데이터베이스의 복제 등 높은 인프라스트럭처 지식이 필요할 수 있습니다."
+  doYouConnectToFediverse: "Fediverse에 접속하시겠습니까?"
+  doYouConnectToFediverse_description1: "분산형 서버로 구성된 네트워크(Fediverse)에 접속하면 다른 서버와 서로 콘텐츠의 주고받기를 할 수 있습니다."
+  doYouConnectToFediverse_description2: "Fediverse에 접속하는 것을 '연합'이라고도 부릅니다."
+  youCanConfigureMoreFederationSettingsLater: "나중에 연합 가능한 서버의 지정 등 고급 설정을 할 수 있습니다."
+  adminInfo: "관리자 정보"
+  adminInfo_description: "문의 접수를 위해 사용되는 관리자 정보를 설정합니다."
+  adminInfo_mustBeFilled: "오픈 서버 혹은 연합이 켜져 있는 경우 반드시 입력해야 합니다."
+  followingSettingsAreRecommended: "아래의 설정이 권장됩니다."
+  applyTheseSettings: "이 설정을 적용"
+  skipSettings: "설정 건너뛰기"
+  settingsCompleted: "설정이 완료됐습니다!"
+  settingsCompleted_description: "수고하셨습니다. 준비를 마쳤으므로 바로 서버의 이용을 시작하실 수 있습니다."
+  settingsCompleted_description2: "상세한 서버 설정은 '제어판'에서 하실 수 있습니다."
+  donationRequest: "기부 요청"
+  _donationRequest:
+    text1: "Misskey는 자원봉사자들에 의해 개발되는 무료 소프트웨어입니다."
+    text2: "앞으로도 계속해서 개발을 할 수 있도록 괜찮으시다면 부디 기부를 부탁드립니다."
+    text3: "지원자 대상 특전도 있습니다!"
+_uploader:
+  editImage: "이미지 편집"
+  compressedToX: "{x}로 압축"
+  savedXPercent: "{x}% 절약"
+  abortConfirm: "업로드되지 않은 파일이 있습니다만, 그만 두시겠습니까?"
+  doneConfirm: "업로드되지 않은 파일이 있습니다만, 완료하시겠습니까?"
+  maxFileSizeIsX: "업로드 가능한 최대 파일 크기는 {x}입니다."
+  allowedTypes: "업로드 가능한 파일 유형"
+  tip: "파일은 아직 업로드되지 않았습니다. 이 다이얼로그에서 업로드 전의 확인, 이름 바꾸기, 압축, 자르기 등을 하실 수 있습니다. 준비가 되셨다면 '업로드' 버튼을 클릭해 업로드를 시작하실 수 있습니다."
+_clientPerformanceIssueTip:
+  title: "배터리 소비가 심하다고 생각되시면"
+  makeSureDisabledAdBlocker: "광고 차단을 비활성화해 주십시오."
+  makeSureDisabledAdBlocker_description: "광고 차단은 성능에 영향을 미칠 수 있습니다. OS의 기능이나 브라우저의 기능, 애드온 등으로 광고 차단이 활성화돼있지 않은지 확인해 주십시오."
+  makeSureDisabledCustomCss: "커스텀 CSS를 무효로 해주십시오."
+  makeSureDisabledCustomCss_description: "스타일을 덮어쓰기하면 성능에 영향을 미칠 수 있습니다. 커스텀 CSS나 스타일을 덮어쓰기하는 확장 기능이 유효로 돼있는지 확인해주십시오."
+  makeSureDisabledAddons: "확장 기능을 비활성화해 주십시오."
+  makeSureDisabledAddons_description: "일부 확장 기능은 클라이언트의 동작에 간섭해 성능에 영향을 미칠 수 있습니다. 브라우저의 확장 기능을 비활성화해 개선할지 확인해주십시오."
+_clip:
+  tip: "클립은 노트를 정리할 수 있는 기능입니다."
+_userLists:
+  tip: "임의의 유저가 포함된 리스트를 작성할 수 있습니다. 작성한 리스트는 타임라인으로 표시가 가능합니다."
+watermark: "워터마크"
+defaultPreset: "기본 프리셋"
+_watermarkEditor:
+  tip: "이미지에 크레딧 정보 등의 워터마크를 추가할 수 있습니다."
+  quitWithoutSaveConfirm: "보존하지 않고 종료하시겠습니까?"
+  driveFileTypeWarn: "이 파이"
+  driveFileTypeWarnDescription: "이미지 파일을 선택해주십시오."
+  title: "워터마크 편집"
+  cover: "전체에 붙이기"
+  repeat: "전면에 깔기"
+  opacity: "불투명도"
+  scale: "크기"
+  text: "텍스트"
+  position: "위치"
+  type: "종류"
+  image: "이미지"
+  advanced: "고급"
+  stripe: "줄무늬"
+  stripeWidth: "라인의 폭"
+  stripeFrequency: "라인의 수"
+  angle: "각도"
+  polkadot: "물방울 무늬"
+  checker: "체크 무늬"
+  polkadotMainDotOpacity: "주요 물방울의 불투명도"
+  polkadotMainDotRadius: "주요 물방울의 크기"
+  polkadotSubDotOpacity: "서브 물방울의 불투명도"
+  polkadotSubDotRadius: "서브 물방울의 크기"
+  polkadotSubDotDivisions: "서브 물방울의 수"
+_imageEffector:
+  title: "이펙트"
+  addEffect: "이펙트를 추가"
+  discardChangesConfirm: "변경을 취소하고 종료하시겠습니까?"
+  _fxs:
+    chromaticAberration: "색수차"
+    glitch: "글리치"
+    mirror: "미러"
+    invert: "색 반전"
+    grayscale: "흑백"
+    colorAdjust: "색조 보정"
+    colorClamp: "색 압축"
+    colorClampAdvanced: "색 압축(고급)"
+    distort: "뒤틀림"
+    threshold: "이진화"
+    zoomLines: "집중선"
+    stripe: "줄무늬"
+    polkadot: "물방울 무늬"
+    checker: "체크 무늬"
+    blockNoise: "노이즈 방지"
+    tearing: "티어링"
+drafts: "초안"
+_drafts:
+  select: "초안 선택"
+  cannotCreateDraftAnymore: "초안 작성 가능 수를 초과했습니다."
+  cannotCreateDraft: "이 내용으로는 초안을 작성할 수 없습니다. "
+  delete: "초안 삭제\n"
+  deleteAreYouSure: "초안을 삭제하시겠습니까?"
+  noDrafts: "초안 없음\n"
+  replyTo: "{user}에 회신"
+  quoteOf: "{user} 노트에 인용"
+  postTo: "{channel}에 게시"
+  saveToDraft: "초안에 저장"
+  restoreFromDraft: "초안에서 복원\n"
+  restore: "복원"
+  listDrafts: "초안 목록"
@@ -483,3 +483,5 @@ _remoteLookupErrors:
    title: "ບໍ່ພົບ"
 _search:
  searchScopeAll: "ທັງໝົດ"
+_watermarkEditor:
+  image: "ຮູບພາບ"
@@ -1078,3 +1078,6 @@ _remoteLookupErrors:
    title: "Niet gevonden"
 _search:
  searchScopeAll: "Alle"
+_watermarkEditor:
+  image: "Afbeeldingen"
+  advanced: "Geavanceerd"
@@ -461,6 +461,8 @@ replies: "Svar"
 renotes: "Renote"
 surrender: "Avbryt"
 information: "Informasjon"
+inMinutes: "Minutter"
+inDays: "Dager"
 _chat:
  invitations: "Inviter"
  members: "Medlemmer"
@@ -735,3 +737,8 @@ _remoteLookupErrors:
    title: "Ikke funnet"
 _search:
  searchScopeAll: "Alle"
+_watermarkEditor:
+  scale: "Størrelse"
+  text: "Tekst"
+  type: "Type"
+  image: "Bilder"
@@ -1040,6 +1040,8 @@ surrender: "Odrzuć"
 gameRetry: "Spróbuj ponownie"
 postForm: "Formularz tworzenia wpisu"
 information: "Informacje"
+inMinutes: "minuta"
+inDays: "dzień"
 _chat:
  invitations: "Zaproś"
  noHistory: "Brak historii"
@@ -1584,3 +1586,10 @@ _remoteLookupErrors:
 _search:
  searchScopeAll: "Wszystkie"
  searchScopeLocal: "Lokalne"
+_watermarkEditor:
+  opacity: "Przezroczystość"
+  scale: "Rozmiar"
+  text: "Tekst"
+  type: "Typ"
+  image: "Zdjęcia"
+  advanced: "Zaawansowane"
@@ -298,6 +298,7 @@ uploadFromUrl: "Enviar por URL"
 uploadFromUrlDescription: "URL do arquivo que você deseja enviar"
 uploadFromUrlRequested: "Upload solicitado"
 uploadFromUrlMayTakeTime: "Pode levar algum tempo para que o upload seja concluído."
+uploadNFiles: "Enviar {n} arquivos"
 explore: "Explorar"
 messageRead: "Lida"
 noMoreHistory: "Não existe histórico anterior"
@@ -326,6 +327,7 @@ dark: "Escuro"
 lightThemes: "Tema claro"
 darkThemes: "Tema escuro"
 syncDeviceDarkMode: "Sincronize com o modo escuro do dispositivo"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "\"{x}\" está ativado. Você gostaria de desligar a sincronização e alterar manualmente?"
 drive: "Drive"
 fileName: "Nome do Ficheiro"
 selectFile: "Selecione os arquivos"
@@ -444,7 +446,7 @@ exploreUsersCount: "Há um utilizador de {count}"
 exploreFediverse: "Explorar Fediverse"
 popularTags: "Tags populares"
 userList: "Listas"
-about: "Informações"
+about: "Sobre"
 aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Símbolo"
@@ -578,6 +580,7 @@ newNoteRecived: "Nova nota recebida"
 newNote: "Nova Nota"
 sounds: "Sons"
 sound: "Sons"
+notificationSoundSettings: "Configurações de som de notificações"
 listen: "Ouvir"
 none: "Nenhum"
 showInPage: "Ver na página"
@@ -999,6 +1002,7 @@ failedToUpload: "Falha ao enviar"
 cannotUploadBecauseInappropriate: "Esse arquivo não pôde ser enviado porque partes dele foram detectadas como potencialmente inapropriadas."
 cannotUploadBecauseNoFreeSpace: "Envio falhou devido à falta de capacidade no Drive."
 cannotUploadBecauseExceedsFileSizeLimit: "Não é possível realizar o upload deste arquivo porque ele excede o tamanho máximo permitido."
+cannotUploadBecauseUnallowedFileType: "Não foi possível fazer o envio, pois o formato do arquivo não foi autorizado."
 beta: "Beta"
 enableAutoSensitive: "Marcar automaticamente como conteúdo sensível"
 enableAutoSensitiveDescription: "Quando disponível, a marcação de mídia sensível será automaticamente atribuído ao conteúdo de mídia usando aprendizado de máquina. Mesmo que você desative essa função, em alguns servidores, isso pode ser configurado automaticamente."
@@ -1309,6 +1313,7 @@ availableRoles: "Cargos disponíveis"
 acknowledgeNotesAndEnable: "Ative após compreender as precauções."
 federationSpecified: "Esse servidor opera com uma lista branca de federação. Interagir com servidores diferentes daqueles designados pela administração não é permitido."
 federationDisabled: "Federação está desabilitada nesse servidor. Você não pode interagir com usuários de outros servidores."
+draft: "Rascunhos"
 confirmOnReact: "Confirmar ao reagir"
 reactAreYouSure: "Você deseja adicionar uma reação \"{emoji}\"?"
 markAsSensitiveConfirm: "Você deseja definir essa mídia como sensível?"
@@ -1326,6 +1331,7 @@ restore: "Redefinir"
 syncBetweenDevices: "Sincronizar entre dispositivos"
 preferenceSyncConflictTitle: "O valor configurado já existe no servidor."
 preferenceSyncConflictText: "As preferências com a sincronização ativada irão salvar os seus valores no servidor. Porém, já existem valores no servidor. Qual conjunto de valores você deseja sobrescrever?"
+preferenceSyncConflictChoiceMerge: "Combinar"
 preferenceSyncConflictChoiceServer: "Valor configurado no servidor"
 preferenceSyncConflictChoiceDevice: "Valor configurado no dispositivo"
 preferenceSyncConflictChoiceCancel: "Cancelar a habilitação de sincronização"
@@ -1333,7 +1339,7 @@ paste: "Colar"
 emojiPalette: "Paleta de emojis"
 postForm: "Campo de postagem"
 textCount: "Contagem de caracteres"
-information: "Informações"
+information: "Sobre"
 chat: "Conversas"
 migrateOldSettings: "Migrar configurações antigas de cliente"
 migrateOldSettings_description: "Isso deve ser feito automaticamente. Caso o processo de migração tenha falhado, você pode acioná-lo manualmente. As informações atuais de migração serão substituídas."
@@ -1356,6 +1362,17 @@ emojiMute: "Silenciar emoji"
 emojiUnmute: "Reativar emoji"
 muteX: "Silenciar {x}"
 unmuteX: "Reativar {x}"
+abort: "Abortar"
+tip: "Dicas e Truques"
+redisplayAllTips: "Mostrar todas as \"Dicas e Truques\" novamente"
+hideAllTips: "Ocultas todas as \"Dicas e Truques\""
+defaultImageCompressionLevel: "Nível de compressão de imagem padrão"
+defaultImageCompressionLevel_description: "Alto, reduz o tamanho do arquivo mas, também, a qualidade da imagem.<br>Alto, reduz o tamanho do arquivo mas, também, a qualidade da imagem."
+inMinutes: "Minuto(s)"
+inDays: "Dia(s)"
+_order:
+  newest: "Priorizar Mais Novos"
+  oldest: "Priorizar Mais Antigos"
 _chat:
  noMessagesYet: "Ainda não há mensagens"
  newMessage: "Nova mensagem"
@@ -1442,6 +1459,8 @@ _settings:
  contentsUpdateFrequency: "Frequência da obtenção de conteúdo"
  contentsUpdateFrequency_description: "Quanto maior o valor, mais o conteúdo atualiza. Porém, há uma diminuição do desempenho e aumento do tráfego e consumo de memória."
  contentsUpdateFrequency_description2: "Quando o modo tempo-real está ativado, o conteúdo é atualizado em tempo real, ignorando essa opção."
+  showUrlPreview: "Exibir prévia de URL"
+  showAvailableReactionsFirstInNote: "Exibir reações disponíveis no topo."
  _chat:
    showSenderName: "Exibir nome de usuário do remetente"
    sendOnEnter: "Pressionar Enter para enviar"
@@ -1977,6 +1996,11 @@ _role:
    canImportMuting: "Permitir importação de silenciamentos"
    canImportUserLists: "Permitir importação de listas"
    chatAvailability: "Permitir Conversas"
+    uploadableFileTypes: "Tipos de arquivo enviáveis"
+    uploadableFileTypes_caption: "Especifica tipos MIME permitidos. Múltiplos tipos MIME podem ser especificados separando-os por linha. Curingas podem ser especificados com um asterisco (*). (exemplo, image/*)"
+    uploadableFileTypes_caption2: "Alguns tipos de arquivos podem não ser detectados. Para permiti-los, adicione {x} à especificação."
+    noteDraftLimit: "Limite de rascunhos possíveis"
+    watermarkAvailable: "Disponibilidade da função de marca d'água"
  _condition:
    roleAssignedTo: "Atribuído a cargos manuais"
    isLocal: "Usuário local"
@@ -2136,6 +2160,7 @@ _theme:
  install: "Instalar um tema"
  manage: "Gerenciar temas"
  code: "Código do tema"
+  copyThemeCode: "Copiar código do tema"
  description: "Descrição"
  installed: "{name} foi instalado"
  installedThemes: "Temas instalados"
@@ -2449,6 +2474,8 @@ _visibility:
  disableFederation: "Defederar"
  disableFederationDescription: "Não transmitir às outras instâncias"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "Há arquivos que não foram enviados, gostaria de descartá-los e fechar o editor?"
+  uploaderTip: "O arquivo ainda não foi enviado. No menu do arquivo, você pode renomear, cortar, adicionar uma marca d'água, comprimir ou descomprimir um arquivo. Arquivos serão enviados automaticamente ao publicar a nota."
  replyPlaceholder: "Responder a essa nota..."
  quotePlaceholder: "Citar essa nota..."
  channelPlaceholder: "Postar em canal..."
@@ -2782,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "Adicionado em"
  attachedNotes: "Notas anexadas"
+  usage: "Usado"
  thisPageCanBeSeenFromTheAuthor: "Essa página só pode ser vista pelo usuário que enviou esse arquivo."
 _externalResourceInstaller:
  title: "Instalar de site externo"
@@ -2829,6 +2857,12 @@ _dataSaver:
  _avatar:
    title: "Imagem do avatar"
    description: "Parar animação de avatares. Imagens animadas podem ter um arquivo mais pesado do que imagens normais, potencialmente levando a reduções no tráfego de dados."
+  _urlPreviewThumbnail:
+    title: "Esconder miniaturas em prévias de URL"
+    description: "Miniaturas em prévias de URL não serão carregadas."
+  _disableUrlPreview:
+    title: "Desabilitar prévias de URL"
+    description: "Desabilita a função de prévias de URL. Diferente das miniaturas, essa função impede o carregamento de toda informação do link."
  _code:
    title: "Destaque de código"
    description: "Se as notações de formatação de código forem utilizadas em MFM, elas não irão carregar até serem selecionadas. Destaque de código exige baixar arquivos de alta definição para cada linguagem de programação. Logo, desabilitar o carregamento automático desses arquivos diminui a quantidade de informação comunicada."
@@ -2886,6 +2920,8 @@ _offlineScreen:
 _urlPreviewSetting:
  title: "Configurações da prévia de URL"
  enable: "Habilitar prévia de URL"
+  allowRedirect: "Permitir redirecionamentos de URL em prévias."
+  allowRedirectDescription: "Se um URL tem um redirecionamento, você pode habilitar essa função para segui-lo e exibir a prévia do conteúdo redirecionado. Desabilitar isso irá economizar recursos, mas o conteúdo não será exibido."
  timeout: "Tempo máximo para obter a prévia (ms)"
  timeoutDescription: "Se demorar mais que esse valor para obter uma prévia, ela não será gerada."
  maximumContentLength: "Content-Length máximo (em bytes)"
@@ -3076,6 +3112,15 @@ _serverSetupWizard:
    text1: "Misskey é software aberto desenvolvido por voluntários."
    text2: "Nós apreciaríamos o seu apoio para podermos continuar o desenvolvimento desse software no futuro."
    text3: "Também há benefícios especiais para apoiadores!"
+_uploader:
+  editImage: "Editar Imagem"
+  compressedToX: "Comprimido para {x}"
+  savedXPercent: "Salvando {x}%"
+  abortConfirm: "Alguns arquivos não foram enviados, deseja abortar?"
+  doneConfirm: "Alguns arquivos não foram enviados, deseja continuar mesmo assim?"
+  maxFileSizeIsX: "O tamanho máximo de arquivos enviados é {x}"
+  allowedTypes: "Tipos de arquivo enviáveis"
+  tip: "O arquivo não foi enviado. Então, esse diálogo permite que você confirme, renomeie, comprima e recorte o arquivo antes de enviar. Quando estiver pronto, você pode enviar apertando  o botão \"Enviar\"."
 _clientPerformanceIssueTip:
  title: "Dicas de desempenho"
  makeSureDisabledAdBlocker: "Desative o seu bloqueador de anúncios"
@@ -3084,3 +3129,71 @@ _clientPerformanceIssueTip:
  makeSureDisabledCustomCss_description: "Substituir o estilo da página pode afetar o desempenho. Certifique-se que o CSS personalizado ou extensões que modifiquem o estilo da página estejam desabilitados."
  makeSureDisabledAddons: "Desabilite extensões"
  makeSureDisabledAddons_description: "Algumas extensões podem afetar comportamentos do cliente e afetar o desempenho. Por favor, desative as extensões do seu navegador e veja se isso melhora a situação."
+_clip:
+  tip: "Clip é uma função que permite organização das suas notas."
+_userLists:
+  tip: "Listas podem conter qualquer usuário que você especificar em sua criação. A lista criada aparece como uma linha do tempo exibindo usuários selecionados."
+watermark: "Marca d'água"
+defaultPreset: "Predefinição Padrão"
+_watermarkEditor:
+  tip: "Uma marca d'água, como informação de autoria, pode ser adicionada à imagem."
+  quitWithoutSaveConfirm: "Descartar mudanças?"
+  driveFileTypeWarn: "Esse arquivo não é compatível"
+  driveFileTypeWarnDescription: "Escolha um arquivo de imagem"
+  title: "Editar marca d'água"
+  cover: "Cobrir tudo"
+  repeat: "Espalhar pelo conteúdo"
+  opacity: "Opacidade"
+  scale: "Tamanho"
+  text: "Texto"
+  position: "Posição"
+  type: "Tipo"
+  image: "imagem"
+  advanced: "Avançado"
+  stripe: "Listras"
+  stripeWidth: "Largura da linha"
+  stripeFrequency: "Número de linhas"
+  angle: "Ângulo"
+  polkadot: "Bolinhas"
+  checker: "Xadrez"
+  polkadotMainDotOpacity: "Opacidade da bolinha principal"
+  polkadotMainDotRadius: "Raio da bolinha principal"
+  polkadotSubDotOpacity: "Opacidade da bolinha secundária"
+  polkadotSubDotRadius: "Raio das bolinhas adicionais"
+  polkadotSubDotDivisions: "Número de bolinhas adicionais"
+_imageEffector:
+  title: "Efeitos"
+  addEffect: "Adicionar efeitos"
+  discardChangesConfirm: "Tem certeza que deseja sair? Há mudanças não salvas."
+  _fxs:
+    chromaticAberration: "Aberração cromática"
+    glitch: "Glitch"
+    mirror: "Espelho"
+    invert: "Inverter Cores"
+    grayscale: "Tons de Cinza"
+    colorAdjust: "Correção de Cores"
+    colorClamp: "Compressão de Cores"
+    colorClampAdvanced: "Compressão Avançada de Cores"
+    distort: "Distorção"
+    threshold: "Limiarização Binária"
+    zoomLines: "Linhas de Ação"
+    stripe: "Listras"
+    polkadot: "Bolinhas"
+    checker: "Xadrez"
+    blockNoise: "Bloquear Ruído"
+    tearing: "Descontinuidade"
+drafts: "Rascunhos"
+_drafts:
+  select: "Selecionar Rascunho"
+  cannotCreateDraftAnymore: "O número máximo de rascunhos foi excedido."
+  cannotCreateDraft: "Você não pode criar um rascunho com esse conteúdo."
+  delete: "Excluir Rascunho"
+  deleteAreYouSure: "Excluir rascunho?"
+  noDrafts: "Sem rascunhos"
+  replyTo: "Resposta a {user}"
+  quoteOf: "Citação à nota de {user}"
+  postTo: "Publicando em {channel}"
+  saveToDraft: "Salvar como Rascunho"
+  restoreFromDraft: "Restaurar de Rascunho"
+  restore: "Redefinir"
+  listDrafts: "Lista de Rascunhos"
@@ -1391,3 +1391,10 @@ _search:
  searchScopeLocal: "Local"
  searchScopeUser: "Utilizator specific"
  serverHostPlaceholder: "Exemplu: misskey.example.com"
+_watermarkEditor:
+  scale: "Dimensiune"
+  text: "Text"
+  position: "Poziție"
+  type: "Tip"
+  image: "Imagini"
+  advanced: "Avansat"
@@ -2,7 +2,7 @@
 _lang_: "Русский"
 headlineMisskey: "Сеть, сплетённая из заметок"
 introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
-poweredByMisskeyDescription: "{name} – сервис на платформе с открытым исходным кодом <b>Misskey</b>, называемый экземпляром Misskey."
+poweredByMisskeyDescription: "{name} – один из инстансов (также называемый экземпляром Misskey), использующий платформу с открытым исходным кодом <b>Misskey</b>."
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 reset: "Сброс"
@@ -82,7 +82,7 @@ export: "Экспорт"
 files: "Файлы"
 download: "Скачать"
 driveFileDeleteConfirm: "Удалить файл «{name}»? Заметки с ним также будут удалены."
-unfollowConfirm: "Удалить из подписок пользователя {name}?"
+unfollowConfirm: "Отписаться от {name} ?"
 exportRequested: "Вы запросили экспорт. Это может занять некоторое время. Результат будет добавлен на «Диск»."
 importRequested: "Вы запросили импорт. Это может занять некоторое время."
 lists: "Списки"
@@ -298,6 +298,7 @@ uploadFromUrl: "Загрузить по ссылке"
 uploadFromUrlDescription: "Ссылка на файл, который хотите загрузить"
 uploadFromUrlRequested: "Загрузка выбранного"
 uploadFromUrlMayTakeTime: "Загрузка может занять некоторое время."
+uploadNFiles: "Загрузить {n} файл"
 explore: "Обзор"
 messageRead: "Прочитали"
 noMoreHistory: "История закончилась"
@@ -575,8 +576,10 @@ showFixedPostForm: "Показывать поле для ввода новой
 showFixedPostFormInChannel: "Показывать поле для ввода новой заметки наверху ленты (каналы)"
 withRepliesByDefaultForNewlyFollowed: "По умолчанию включайте ответы новых пользователей, на которых вы подписались, во временную шкалу"
 newNoteRecived: "Появилась новая заметка"
+newNote: "Новая заметка"
 sounds: "Звуки"
 sound: "Звуки"
+notificationSoundSettings: "Настройки звука уведомлений"
 listen: "Слушать"
 none: "Ничего"
 showInPage: "Показать страницу"
@@ -791,6 +794,7 @@ wide: "Толстый"
 narrow: "Тонкий"
 reloadToApplySetting: "Это настройка вступает в силу при загрузке страницы. Перезагрузить сейчас?"
 needReloadToApply: "Изменения вступят в силу после перезагрузки страницы."
+needToRestartServerToApply: "Для вступления изменений в силу необходимо перезапустить сервер."
 showTitlebar: "Показать заголовок"
 clearCache: "Очистить кэш"
 onlineUsersCount: "Пользователей сейчас в сети: {n}"
@@ -1176,13 +1180,25 @@ unused: "Неиспользованное"
 used: "Использован"
 expired: "Срок действия приглашения истёк"
 doYouAgree: "Согласны?"
+beSureToReadThisAsItIsImportant: "Это важно, поэтому, пожалуйста, прочтите это."
+iHaveReadXCarefullyAndAgree: "Я прочитал(а) и согласен(сна) с условиями \"{x}"
+dialog: "Диалог"
 icon: "Аватар"
+currentAnnouncements: "Текущие новости"
+pastAnnouncements: "Предыдущие новости"
+youHaveUnreadAnnouncements: "У вас есть непрочитанные уведомления"
 replies: "Ответы"
 renotes: "Репост"
 loadReplies: "Показать ответы"
+loadConversation: "Загрузить беседу"
 pinnedList: "Закреплённый список"
 keepScreenOn: "Держать экран включённым"
+unnotifyNotes: "Отписаться от сообщений"
+authentication: "Аутентификация"
+authenticationRequiredToContinue: "Пожалуйста, пройдите аутентификацию, чтобы продолжить"
+dateAndTime: "Дата и время"
 showRenotes: "Показывать репосты"
+edited: "Изменено"
 mutualFollow: "Взаимные подписки"
 followingOrFollower: "Подписки или подписчики"
 fileAttachedOnly: "Только заметки с файлами"
@@ -1193,30 +1209,71 @@ sourceCode: "Исходный код"
 sourceCodeIsNotYetProvided: "Исходный код пока не доступен. Свяжитесь с администратором, чтобы исправить эту проблему."
 repositoryUrl: "Ссылка на репозиторий"
 repositoryUrlDescription: "Если вы используете Misskey как есть (без изменений в исходном коде), введите https://github.com/misskey-dev/misskey"
+feedback: "Обратная связь"
 privacyPolicy: "Политика Конфиденциальности"
 privacyPolicyUrl: "Ссылка на Политику Конфиденциальности"
+tosAndPrivacyPolicy: "Условия использования и политика конфиденциальности"
+avatarDecorations: "Украшения для аватара"
 attach: "Прикрепить"
 angle: "Угол"
 flip: "Переворот"
+showAvatarDecorations: "Показать украшения для аватара"
+pullDownToRefresh: "Опустите что бы обновить"
 useGroupedNotifications: "Отображать уведомления сгруппировано"
+signupPendingError: "Возникла проблема с подтверждением вашего адреса электронной почты. Возможно, срок действия ссылки истёк."
+cwNotationRequired: "Если включена опция «Скрыть содержимое», необходимо написать аннотацию."
 doReaction: "Добавить реакцию"
 code: "Код"
+reloadRequiredToApplySettings: "Для применения настроек необходима обновить страницу."
 remainingN: "Остаётся: {n}"
+overwriteContentConfirm: "Текущее содержимое будет перезаписано. Вы уверены?"
 seasonalScreenEffect: "Эффект времени года на экране"
 decorate: "Украсить"
 addMfmFunction: "Добавить MFM"
+bubbleGame: "BubbleGame"
+sfx: "Звуковые эффекты"
+soundWillBePlayed: "Будет воспроизведен звук"
+showReplay: "Показать повтор"
+endReplay: "Конец повтора"
 lastNDays: "Последние {n} сут"
 hemisphere: "Место проживания"
+userSaysSomethingSensitive: "Сообщение, содержит конфиденциальные файлы от {name}"
 enableHorizontalSwipe: "Смахните в сторону, чтобы сменить вкладки"
 surrender: "Этот пост не может быть отменен."
+gameRetry: "Повторить попытку"
+notUsePleaseLeaveBlank: "Если не используется, оставьте пустым"
 useNativeUIForVideoAudioPlayer: "Использовать интерфейс браузера при проигрывании видео и звука"
 keepOriginalFilename: "Сохранять исходное имя файла"
 keepOriginalFilenameDescription: "Если вы выключите данную настройку, имена файлов будут автоматически заменены случайной строкой при загрузке."
 alwaysConfirmFollow: "Всегда подтверждать подписку"
 inquiry: "Связаться"
+fromX: "Из {x}"
+genEmbedCode: "Сгенерировать код для "
+noteOfThisUser: "Список заметок этого пользователя"
+clipNoteLimitExceeded: "К этому клипу больше нельзя добавить заметки"
+performance: "Производительность"
+modified: "Изменено"
+signinWithPasskey: "Войдите в систему, используя свой пароль"
+unknownWebAuthnKey: "Не известный ключ "
+passkeyVerificationFailed: "Ошибка проверка ключа доступа "
 messageToFollower: "Сообщение подписчикам"
+testCaptchaWarning: "Эта функция предназначена для тестирования CAPTCHA. <strong>Не использовать это в рабочей среде</strong>"
+prohibitedWordsForNameOfUser: "Запрещенные слова (имя пользователя)"
+prohibitedWordsForNameOfUserDescription: "Если имя пользователя содержит строку из этого списка, изменение имени пользователя будет запрещено. На пользователей с правами модератора это ограничение не распространяется. Имена пользователей также проверяются путём замены всех букв в нижнем регистре"
+yourNameContainsProhibitedWords: "Имя, которое вы пытаетесь изменить, содержит запрещенную строку символов"
+yourNameContainsProhibitedWordsDescription: "Имя содержит запрещённую строку символов. Если вы хотите использовать это имя, обратитесь к администратору сервера"
+thisContentsAreMarkedAsSigninRequiredByAuthor: "Автор сообщения установил требование в виде авторизации для просмотра"
+lockdown: "Доступ ограничен"
+pleaseSelectAccount: "Выберите свой аккаунт"
+availableRoles: "Доступные роли"
+federationDisabled: "Федерация отключена для этого сервера. Вы не можете взаимодействовать с пользователями на других серверах."
+draft: "Черновик"
+markAsSensitiveConfirm: "Отметить контент как чувствительный?"
+resetToDefaultValue: "Сбросить настройки до стандартных"
 postForm: "Форма отправки"
 information: "Описание"
+inMinutes: "мин"
+inDays: "сут"
 _chat:
  invitations: "Пригласить"
  noHistory: "История пока пуста"
@@ -2191,3 +2248,13 @@ _search:
  searchScopeAll: "Все"
  searchScopeLocal: "Местная"
  searchScopeUser: "Указанный пользователь"
+_watermarkEditor:
+  opacity: "Непрозрачность"
+  scale: "Размер"
+  text: "Текст"
+  position: "Позиция"
+  type: "Тип"
+  image: "Изображения"
+  advanced: "Для продвинутых"
+  angle: "Угол"
+drafts: "Черновик"
@@ -913,6 +913,8 @@ flip: "Preklopiť"
 lastNDays: "Posledných {n} dní"
 postForm: "Napísať poznámku"
 information: "Informácie"
+inMinutes: "min"
+inDays: "dní"
 _chat:
  invitations: "Pozvať"
  noHistory: "Žiadna história"
@@ -1450,3 +1452,10 @@ _remoteLookupErrors:
 _search:
  searchScopeAll: "Všetko"
  searchScopeLocal: "Lokálne"
+_watermarkEditor:
+  opacity: "Priehľadnosť"
+  scale: "Veľkosť"
+  text: "Text"
+  type: "Typ"
+  image: "Obrázky"
+  advanced: "Rozšírené"
@@ -711,3 +711,6 @@ _selfXssPrevention:
  warning: "VARNING"
 _search:
  searchScopeAll: "Allt"
+_watermarkEditor:
+  scale: "Storlek"
+  image: "Bilder"
@@ -460,3 +460,5 @@ _moderationLogTypes:
  resetPassword: "Şifre sıfırlama"
 _search:
  searchScopeAll: "Tümü"
+_watermarkEditor:
+  image: "Görseller"
@@ -8,6 +8,9 @@ search: "Пошук"
 notifications: "Сповіщення"
 username: "Ім'я користувача"
 password: "Пароль"
+initialPasswordForSetup: "Початковий пароль для налаштування"
+initialPasswordIsIncorrect: "Початковий пароль для налаштування неправильний"
+initialPasswordForSetupDescription: "Використайте пароль, вказаний у конфігураційному файлі, якщо ви встановлювали Misskey власноруч.\nЯкщо використовуєте сервіси хостингу Misskey, використайте наданий пароль.\nЯкщо ви не маєте паролю, лишіть порожнім щоб продовжити. "
 forgotPassword: "Я забув пароль"
 fetchingAsApObject: "Отримуємо з федіверсу..."
 ok: "OK"
@@ -45,6 +48,7 @@ pin: "Закріпити"
 unpin: "Відкріпити"
 copyContent: "Скопіювати контент"
 copyLink: "Скопіювати посилання"
+copyRemoteLink: "Копіювати віддалене посилання"
 delete: "Видалити"
 deleteAndEdit: "Видалити й редагувати"
 deleteAndEditConfirm: "Ви впевнені, що хочете видалити цю нотатку та відредагувати її? Ви втратите всі реакції, поширення та відповіді на неї."
@@ -57,6 +61,7 @@ copyUserId: "Копіювати ID користувача"
 copyNoteId: "блокнот ID користувача"
 copyFileId: "Скопіювати ідентифікатор файлу."
 searchUser: "Пошук користувачів"
+searchThisUsersNotes: "Пошук нотаток користувача"
 reply: "Відповісти"
 loadMore: "Показати більше"
 showMore: "Показати більше"
@@ -105,9 +110,11 @@ enterEmoji: "Введіть емодзі"
 renote: "Поширити"
 unrenote: "Відміна поширення"
 renoted: "Поширити запис."
+renotedToX: "Поширено до {name}"
 cantRenote: "Неможливо поширити."
 cantReRenote: "Поширення не можливо поширити."
 quote: "Цитата"
+inChannelRenote: "Поширено у канал"
 pinnedNote: "Закріплений запис"
 pinned: "Закріпити"
 you: "Ви"
@@ -116,6 +123,7 @@ sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
 reactions: "Реакції"
+emojiPicker: "Вибір реакції"
 reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
 attachCancel: "Видалити вкладення"
@@ -289,7 +297,9 @@ folderName: "Ім'я теки"
 createFolder: "Створити теку"
 renameFolder: "Перейменувати теку"
 deleteFolder: "Видалити теку"
+folder: "Тека"
 addFile: "Додати файл"
+showFile: "Показати файл"
 emptyDrive: "Диск порожній"
 emptyFolder: "Тека порожня"
 unableToDelete: "Видалення неможливе"
@@ -302,6 +312,7 @@ copyUrl: "Копіювати URL"
 rename: "Перейменувати"
 avatar: "Аватар"
 banner: "Банер"
+displayOfSensitiveMedia: "Показ чутливого медіа"
 whenServerDisconnected: "Коли зв’язок із сервером втрачено"
 disconnectedFromServer: "Зв’язок із сервером було перервано"
 reload: "Оновити"
@@ -348,8 +359,11 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Увімкнути hCaptcha"
 hcaptchaSiteKey: "Ключ сайту"
 hcaptchaSecretKey: "Секретний ключ"
+mcaptcha: "MCaptcha"
+enableMcaptcha: "Увімкнути MCaptcha"
 mcaptchaSiteKey: "Ключ сайту"
 mcaptchaSecretKey: "Секретний ключ"
+mcaptchaInstanceUrl: "Посилання на сервер MCaptcha"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Увімкнути reCAPTCHA"
 recaptchaSiteKey: "Ключ сайту"
@@ -905,6 +919,8 @@ flip: "Перевернути"
 lastNDays: "Останні {n} днів"
 postForm: "Створення нотатки"
 information: "Інформація"
+inMinutes: "х"
+inDays: "д"
 _chat:
  invitations: "Запросити"
  noHistory: "Історія порожня"
@@ -1625,3 +1641,10 @@ _remoteLookupErrors:
 _search:
  searchScopeAll: "Всі"
  searchScopeLocal: "Локальна"
+_watermarkEditor:
+  opacity: "Непрозорість"
+  scale: "Розмір"
+  text: "Текст"
+  type: "Тип"
+  image: "Зображення"
+  advanced: "Розширені"
@@ -1097,3 +1097,8 @@ _remoteLookupErrors:
 _search:
  searchScopeAll: "Barcha"
  searchScopeLocal: "Mahalliy"
+_watermarkEditor:
+  text: "Matn"
+  type: "turi"
+  image: "Rasmlar"
+  advanced: "Murakkab"
@@ -220,6 +220,7 @@ silenceThisInstance: "Máy chủ im lặng"
 mediaSilenceThisInstance: "Tắt nội dung đa phương tiện từ máy chủ này"
 operations: "Vận hành"
 software: "Phần mềm"
+softwareName: "Tên phần mềm"
 version: "Phiên bản"
 metadata: "Metadata"
 withNFiles: "{n} tập tin"
@@ -1211,18 +1212,25 @@ federationDisabled: "Liên kết bị vô hiệu hóa trên máy chủ này. B
 reactAreYouSure: "Bạn có muốn phản hồi với \" {emoji} \" không?"
 preferences: "Thiết lập môi trường"
 accessibility: "Khả năng tiếp cận"
+preferencesProfile: "Hồ sơ sở thích"
+preferenceSyncConflictTitle: "Cài đặt tồn tại trên máy chủ"
+preferenceSyncConflictText: "Các thiết lập đồng bộ hóa được bật sẽ lưu các giá trị của chúng vào máy chủ. Tuy nhiên, có những giá trị hiện có trên máy chủ. Bạn muốn ghi đè lên bộ giá trị nào?"
 paste: "dán"
 postForm: "Mẫu đăng"
 information: "Giới thiệu"
 chat: "Trò chuyện"
 migrateOldSettings: "Di chuyển cài đặt cũ"
 migrateOldSettings_description: "Thông thường, quá trình này diễn ra tự động, nhưng nếu vì lý do nào đó mà quá trình di chuyển không thành công, bạn có thể kích hoạt thủ công quy trình di chuyển, quá trình này sẽ ghi đè lên thông tin cấu hình hiện tại của bạn."
+inMinutes: "phút"
+inDays: "ngày"
 _chat:
  invitations: "Mời"
  noHistory: "Không có dữ liệu"
  members: "Thành viên"
  home: "Trang chính"
  send: "Gửi"
+_settings:
+  preferencesBanner: "Bạn có thể cấu hình hành vi chung của máy khách theo sở thích của mình."
 _accountSettings:
  requireSigninToViewContents: "Yêu cầu đăng nhập để xem nội dung"
  requireSigninToViewContentsDescription1: "Yêu cầu đăng nhập để xem tất cả ghi chú và nội dung khác mà bạn tạo. Điều này được kỳ vọng sẽ có hiệu quả trong việc ngăn chặn thông tin bị thu thập bởi các trình thu thập thông tin."
@@ -2074,3 +2082,12 @@ _search:
  searchScopeAll: "Tất cả"
  searchScopeLocal: "Máy chủ này"
  searchScopeUser: "Người dùng chỉ định"
+_watermarkEditor:
+  opacity: "Độ trong suốt"
+  scale: "Kích thước"
+  text: "Văn bản"
+  position: "Vị trí"
+  type: "Loại"
+  image: "Hình ảnh"
+  advanced: "Nâng cao"
+  angle: "Góc"
@@ -327,6 +327,7 @@ dark: "深色"
 lightThemes: "浅色主题"
 darkThemes: "深色主题"
 syncDeviceDarkMode: "将深色模式与设备设置同步"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」已开启。要关闭同步并手动切换模式吗？"
 drive: "网盘"
 fileName: "文件名称"
 selectFile: "选择文件"
@@ -1312,11 +1313,12 @@ availableRoles: "可用角色"
 acknowledgeNotesAndEnable: "理解注意事项后再开启。"
 federationSpecified: "此服务器已开启联合白名单。只能与管理员指定的服务器通信。"
 federationDisabled: "此服务器已禁用联合。无法与其它服务器上的用户通信。"
+draft: "草稿"
 confirmOnReact: "发送回应前需要确认"
 reactAreYouSure: "要用「{emoji}」进行回应吗？"
 markAsSensitiveConfirm: "要将此媒体标记为敏感吗？"
 unmarkAsSensitiveConfirm: "要将此媒体解除敏感标记吗？"
-preferences: "设置"
+preferences: "偏好设置"
 accessibility: "辅助功能"
 preferencesProfile: "设置的配置"
 copyPreferenceId: "复制设置 ID"
@@ -1329,6 +1331,7 @@ restore: "恢复"
 syncBetweenDevices: "设备间同步"
 preferenceSyncConflictTitle: "服务器上已存在设定值"
 preferenceSyncConflictText: "服务器上已有此设置的设定值。要覆盖哪个设定值？"
+preferenceSyncConflictChoiceMerge: "合并"
 preferenceSyncConflictChoiceServer: "服务器上的设定值"
 preferenceSyncConflictChoiceDevice: "设备上的设定值"
 preferenceSyncConflictChoiceCancel: "取消同步"
@@ -1360,6 +1363,16 @@ emojiUnmute: "解除隐藏表情符号"
 muteX: "隐藏{x}"
 unmuteX: "解除隐藏{x}"
 abort: "中止"
+tip: "提示和技巧"
+redisplayAllTips: "重新显示所有的提示和技巧"
+hideAllTips: "隐藏所有的提示和技巧"
+defaultImageCompressionLevel: "默认图像压缩等级"
+defaultImageCompressionLevel_description: "较低的等级可以保持画质，但会增加文件大小。<br>较高的等级可以减少文件大小，但相对应的画质将会降低。"
+inMinutes: "分"
+inDays: "日"
+_order:
+  newest: "从新到旧"
+  oldest: "从旧到新"
 _chat:
  noMessagesYet: "还没有消息"
  newMessage: "新消息"
@@ -1447,6 +1460,7 @@ _settings:
  contentsUpdateFrequency_description: "设置越高，内容更新越实时，但性能会降低，并且会消耗更多的流量和电池。"
  contentsUpdateFrequency_description2: "当实时模式开启时，无论此设置如何，内容都会实时更新。"
  showUrlPreview: "显示 URL 预览"
+  showAvailableReactionsFirstInNote: "在顶部显示可用的回应"
  _chat:
    showSenderName: "显示发送者的名字"
    sendOnEnter: "回车键发送"
@@ -1623,7 +1637,7 @@ _serverSettings:
  inquiryUrl: "联络地址"
  inquiryUrlDescription: "用来指定诸如向服务运营商咨询的论坛地址，或记载了运营商联系方式之类的网页地址。"
  openRegistration: "开放注册"
-  openRegistrationWarning: "开放注册有风险。建议仅当能够持续监控服务器并在出现问题时能够立即响应时才打开它。"
+  openRegistrationWarning: "开放注册有风险。建议仅当能够持续监控服务器，并在出现问题时能够立即响应时才打开它。"
  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "若在一段时间内没有检测到管理活动，为防止垃圾信息，此设定将自动关闭。"
  deliverSuspendedSoftware: "停止投递的软件"
  deliverSuspendedSoftwareDescription: "可因安全漏洞之类的原因，停止向指定的服务器及服务器版本送信。版本信息由服务器提供，不保证可靠性。可使用 semver 范围来指定版本，但指定 >= 2024.3.1 将不包括如 2024.3.1-custom.0 等自定义版本，因此建议像 >= 2024.3.1-0 这样指定 prerelease 版本。"
@@ -1636,7 +1650,7 @@ _serverSettings:
  allowExternalApRedirect: "允许通过 ActivityPub 重定向查询"
  allowExternalApRedirect_description: "启用时，将允许其它服务器通过此服务器查询第三方内容，但有可能导致内容欺骗。"
  userGeneratedContentsVisibilityForVisitor: "用户生成内容对非用户的可见性"
-  userGeneratedContentsVisibilityForVisitor_description: "这对于防止诸如难以审核的不适当的远程内容通过您自己的服务器无意中在互联网上公开等问题很有用。"
+  userGeneratedContentsVisibilityForVisitor_description: "对于防止难以审核的不适当的远程内容等，通过自己的服务器无意中在互联网上公开等问题很有用。"
  userGeneratedContentsVisibilityForVisitor_description2: "包含服务器接收到的远程内容在内，无条件将服务器上的所有内容公开在互联网上存在风险。特别是对去中心化的特性不是很了解的访问者有可能将远程服务器上的内容误认为是在此服务器内生成的，需要特别留意。"
  _userGeneratedContentsVisibilityForVisitor:
    all: "全部公开"
@@ -1915,7 +1929,7 @@ _role:
  name: "角色名称"
  description: "角色描述"
  permission: "角色权限"
-  descriptionOfPermission: "<b>监察员</b>可以执行基本地审核操作。\n<b>管理员</b>可以更改服务器的所有设置。"
+  descriptionOfPermission: "<b>监察员</b>可以执行基本的审核操作。\n<b>管理员</b>可以更改实例的所有设置。"
  assignTarget: "授权对象"
  descriptionOfAssignTarget: "<b>手动</b>指手动选择谁被包括在这个角色中。\n<b>符合条件</b>指设置条件以自动包括符合条件的用户。"
  manual: "手动"
@@ -1985,6 +1999,8 @@ _role:
    uploadableFileTypes: "可上传的文件类型"
    uploadableFileTypes_caption: "指定 MIME 类型。可用换行指定多个类型，也可以用星号（*）作为通配符。（如 image/*）"
    uploadableFileTypes_caption2: "文件根据文件的不同，可能无法判断其类型。若要允许此类文件，请在指定中添加 {x}。"
+    noteDraftLimit: "可在服务器上创建多少草稿"
+    watermarkAvailable: "能否使用水印功能"
  _condition:
    roleAssignedTo: "已分配给手动角色"
    isLocal: "是本地用户"
@@ -2135,7 +2151,7 @@ _wordMute:
  muteWordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
  muteWordsDescription2: "正则表达式用斜线包裹"
 _instanceMute:
-  instanceMuteDescription: "隐藏服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
+  instanceMuteDescription: "隐藏服务器中所有的帖子和转帖，包括这些服务器上用户的回复。"
  instanceMuteDescription2: "一行一个"
  title: "下面实例中的帖子将被隐藏。"
  heading: "已隐藏的服务器"
@@ -2144,6 +2160,7 @@ _theme:
  install: "安装主题"
  manage: "主题管理"
  code: "主题代码"
+  copyThemeCode: "复制主题代码"
  description: "描述"
  installed: "{name} 已安装"
  installedThemes: "已安装的主题"
@@ -2457,6 +2474,8 @@ _visibility:
  disableFederation: "不参与联合"
  disableFederationDescription: "不发送到其他服务器"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "还有未上传的文件，要丢弃并关闭窗口吗？"
+  uploaderTip: "文件还未上传。可以在文件菜单中进行重命名、裁剪、添加水印、设置是否压缩等操作。文件将在发帖时自动上传。"
  replyPlaceholder: "回复这个帖子..."
  quotePlaceholder: "引用这个帖子..."
  channelPlaceholder: "发布到频道…"
@@ -2483,7 +2502,7 @@ _profile:
  avatarDecorationMax: "最多可添加 {max} 个挂件"
  followedMessage: "被关注时显示的消息"
  followedMessageDescription: "可以设置被关注时向对方显示的短消息。"
-  followedMessageDescriptionForLockedAccount: "需要批准才能关注的情况下，消息是在请求被批准后显示。"
+  followedMessageDescriptionForLockedAccount: "需要批准才能关注的情况下，消息会在请求被批准后显示。"
 _exportOrImport:
  allNotes: "所有帖子"
  favoritedNotes: "收藏的帖子"
@@ -2790,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "添加日期"
  attachedNotes: "附加到的帖子"
+  usage: "使用"
  thisPageCanBeSeenFromTheAuthor: "此页只能被该文件的上传者查看。"
 _externalResourceInstaller:
  title: "从外部站点安装"
@@ -2900,6 +2920,8 @@ _offlineScreen:
 _urlPreviewSetting:
  title: "设置 URL 预览"
  enable: "启用 URL 预览"
+  allowRedirect: "允许预览目标的重定向"
+  allowRedirectDescription: "如果输入的 URL 被重定向，可设置是否跟随重定向目标并显示预览。禁用此选项将节省服务器资源，但重定向目标的内容将不会显示。"
  timeout: "超时阈值（ms）"
  timeoutDescription: "如果获取预览所用时间超过这个值，则不生成预览。"
  maximumContentLength: "Content-Length 的最大值（byte）"
@@ -3091,12 +3113,14 @@ _serverSetupWizard:
    text2: "为了今后也能继续开发，如果可以的话，请考虑一下捐助。"
    text3: "也有面向支援者的特典！"
 _uploader:
+  editImage: "编辑图像"
  compressedToX: "压缩 {x}"
  savedXPercent: "节省了 {x}% 的空间"
  abortConfirm: "还有未上传的文件，要中止吗？"
  doneConfirm: "还有未上传的文件，要完成吗？"
  maxFileSizeIsX: "可上传最大 {x} 的文件。"
  allowedTypes: "可上传的文件类型"
+  tip: "文件还没有被上传。可在此对话框中进行上传前确认、重命名、压缩、裁剪等操作。准备完成后，点击「上传」即可开始上传。"
 _clientPerformanceIssueTip:
  title: "如果觉得电池耗电过高"
  makeSureDisabledAdBlocker: "请关闭广告拦截器"
@@ -3105,3 +3129,71 @@ _clientPerformanceIssueTip:
  makeSureDisabledCustomCss_description: "覆盖样式可能会影响性能。请确保没有启用任何自定义 CSS 或覆盖样式的扩展。"
  makeSureDisabledAddons: "请关闭扩展"
  makeSureDisabledAddons_description: "某些扩展可能会干扰客户端的运行并影响性能。尝试禁用浏览器扩展并查看是否有改善。"
+_clip:
+  tip: "便签功能可以将帖子合并在一起。"
+_userLists:
+  tip: "可创建包含任意用户的列表。已创建的列表可作为时间线查看。"
+watermark: "水印"
+defaultPreset: "默认预设"
+_watermarkEditor:
+  tip: "可在图像内增加包含作者等信息的水印。"
+  quitWithoutSaveConfirm: "不保存就退出吗？"
+  driveFileTypeWarn: "不支持此文件"
+  driveFileTypeWarnDescription: "请选择图像文件"
+  title: "编辑水印"
+  cover: "覆盖全体"
+  repeat: "平铺"
+  opacity: "不透明度"
+  scale: "大小"
+  text: "文本"
+  position: "位置"
+  type: "类型"
+  image: "图片"
+  advanced: "高级"
+  stripe: "条纹"
+  stripeWidth: "线条宽度"
+  stripeFrequency: "线条数量"
+  angle: "角度"
+  polkadot: "波点"
+  checker: "检查"
+  polkadotMainDotOpacity: "主波点的不透明度"
+  polkadotMainDotRadius: "主波点的大小"
+  polkadotSubDotOpacity: "副波点的不透明度"
+  polkadotSubDotRadius: "副波点的大小"
+  polkadotSubDotDivisions: "副波点的数量"
+_imageEffector:
+  title: "效果"
+  addEffect: "添加效果"
+  discardChangesConfirm: "丢弃当前设置并退出？"
+  _fxs:
+    chromaticAberration: "色差"
+    glitch: "故障"
+    mirror: "镜像"
+    invert: "反转颜色"
+    grayscale: "黑白"
+    colorAdjust: "色彩校正"
+    colorClamp: "颜色限制"
+    colorClampAdvanced: "颜色限制（高级）"
+    distort: "失真"
+    threshold: "二值化"
+    zoomLines: "集中线"
+    stripe: "条纹"
+    polkadot: "波点"
+    checker: "检查"
+    blockNoise: "块状噪点"
+    tearing: "撕裂"
+drafts: "草稿"
+_drafts:
+  select: "选择草稿"
+  cannotCreateDraftAnymore: "已超过可创建的草稿数量。"
+  cannotCreateDraft: "此内容无法创建草稿。"
+  delete: "删除草稿"
+  deleteAreYouSure: "要删除草稿吗？"
+  noDrafts: "没有草稿"
+  replyTo: "回复给 {user}"
+  quoteOf: "对 {user} 帖子的引用"
+  postTo: "向 {channel} 的投稿"
+  saveToDraft: "保存到草稿"
+  restoreFromDraft: "从草稿恢复"
+  restore: "恢复"
+  listDrafts: "草稿一览"
@@ -327,6 +327,7 @@ dark: "深色"
 lightThemes: "淺色佈景主題"
 darkThemes: "深色佈景主題"
 syncDeviceDarkMode: "與裝置的深色模式同步"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」已開啟。要關閉同步並手動切換模式嗎？\n"
 drive: "雲端硬碟"
 fileName: "檔案名稱"
 selectFile: "選擇檔案"
@@ -637,7 +638,7 @@ inboxUrl: "收件夾 URL"
 addedRelays: "已加入的中繼器"
 serviceworkerInfo: "如要使用推播通知，需要啟用此選項並設定金鑰。"
 deletedNote: "已刪除的貼文"
-invisibleNote: "私人貼文"
+invisibleNote: "私密的貼文"
 enableInfiniteScroll: "啟用自動滾動頁面模式"
 visibility: "可見性"
 poll: "票選活動"
@@ -1312,6 +1313,7 @@ availableRoles: "可用角色"
 acknowledgeNotesAndEnable: "了解注意事項後再開啟。"
 federationSpecified: "此伺服器以白名單聯邦的方式運作。除了管理員指定的伺服器外，它無法與其他伺服器互動。"
 federationDisabled: "此伺服器未開啟站台聯邦。無法與其他伺服器上的使用者互動。"
+draft: "草稿\n"
 confirmOnReact: "在做出反應前先確認"
 reactAreYouSure: "用「 {emoji} 」反應嗎？"
 markAsSensitiveConfirm: "要將這個媒體設定為敏感嗎？"
@@ -1329,6 +1331,7 @@ restore: "還原"
 syncBetweenDevices: "裝置之間的同步化"
 preferenceSyncConflictTitle: "伺服器上存在設定值"
 preferenceSyncConflictText: "已啟用同步的設定項目會將設定值儲存至伺服器，並已找到該設定項目在伺服器上儲存的設定值。請選擇要使用哪個設定值進行覆寫。"
+preferenceSyncConflictChoiceMerge: "合併至"
 preferenceSyncConflictChoiceServer: "伺服器設定值"
 preferenceSyncConflictChoiceDevice: "裝置的設定值"
 preferenceSyncConflictChoiceCancel: "取消啟用同步"
@@ -1363,6 +1366,13 @@ abort: "取消"
 tip: "提示與技巧"
 redisplayAllTips: "重新顯示所有「提示與技巧」"
 hideAllTips: "隱藏所有「提示與技巧」"
+defaultImageCompressionLevel: "預設的影像壓縮程度"
+defaultImageCompressionLevel_description: "低的話可以保留畫質，但是會增加檔案的大小。<br>高的話可以減少檔案大小，但是會降低畫質。"
+inMinutes: "分鐘"
+inDays: "日"
+_order:
+  newest: "最新的在前"
+  oldest: "最舊的在前"
 _chat:
  noMessagesYet: "尚無訊息"
  newMessage: "新訊息"
@@ -1450,6 +1460,7 @@ _settings:
  contentsUpdateFrequency_description: "頻率越高，內容更新越即時，但可能會降低效能，並增加資料傳輸量與電池消耗。\n"
  contentsUpdateFrequency_description2: "當即時模式開啟時，不論此設定為何，內容都會即時更新。"
  showUrlPreview: "顯示網址預覽"
+  showAvailableReactionsFirstInNote: "將可用的反應顯示在頂部"
  _chat:
    showSenderName: "顯示發送者的名稱"
    sendOnEnter: "按下 Enter 發送訊息"
@@ -1988,6 +1999,8 @@ _role:
    uploadableFileTypes: "可上傳的檔案類型"
    uploadableFileTypes_caption: "請指定 MIME 類型。可以用換行區隔多個類型，也可以使用星號（*）作為萬用字元進行指定。（例如：image/*）\n"
    uploadableFileTypes_caption2: "有些檔案可能無法判斷其類型。若要允許這類檔案，請在指定中加入 {x}。"
+    noteDraftLimit: "伺服器端可建立的貼文草稿數量上限\n"
+    watermarkAvailable: "浮水印功能是否可用"
  _condition:
    roleAssignedTo: "手動指派角色完成"
    isLocal: "本地使用者"
@@ -2147,6 +2160,7 @@ _theme:
  install: "安裝佈景主題"
  manage: "管理佈景主題"
  code: "佈景主題代碼"
+  copyThemeCode: "複製主題代碼"
  description: "描述"
  installed: "{name}已安裝"
  installedThemes: "已經安裝的佈景主題"
@@ -2460,6 +2474,8 @@ _visibility:
  disableFederation: "停用聯邦"
  disableFederationDescription: "不發送到其他伺服器"
 _postForm:
+  quitInspiteOfThereAreUnuploadedFilesConfirm: "尚有未上傳的檔案，確定要放棄並關閉表單嗎？"
+  uploaderTip: "檔案尚未上傳。您可以從檔案選單中設定重新命名、裁切圖片、加上浮水印、是否壓縮等選項。檔案會在發布貼文時自動上傳。\n"
  replyPlaceholder: "回覆此貼文..."
  quotePlaceholder: "引用此貼文..."
  channelPlaceholder: "發佈到頻道"
@@ -2793,6 +2809,7 @@ _fileViewer:
  url: "URL"
  uploadedAt: "加入日期"
  attachedNotes: "含有附件的貼文"
+  usage: "使用情況"
  thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"
 _externalResourceInstaller:
  title: "從外部網站安裝"
@@ -3096,6 +3113,7 @@ _serverSetupWizard:
    text2: "為了能夠繼續開發，若您願意的話，請考慮進行捐款。\n"
    text3: "也有提供支援者專屬的特典！\n"
 _uploader:
+  editImage: "編輯圖片"
  compressedToX: "壓縮為 {x}"
  savedXPercent: "節省了 {x}%"
  abortConfirm: "有些檔案尚未上傳，您要中止嗎？"
@@ -3115,3 +3133,67 @@ _clip:
  tip: "摘錄是一項可以用來整理貼文的功能。"
 _userLists:
  tip: "您可以建立包含任意使用者的清單。建立後的清單可以作為時間軸顯示。\n"
+watermark: "浮水印"
+defaultPreset: "預設值"
+_watermarkEditor:
+  tip: "可以在圖片中以浮水印加上出處等資訊。"
+  quitWithoutSaveConfirm: "不儲存就退出嗎？"
+  driveFileTypeWarn: "不支援此檔案"
+  driveFileTypeWarnDescription: "請選擇圖片檔案"
+  title: "編輯浮水印"
+  cover: "覆蓋整體"
+  repeat: "佈局"
+  opacity: "透明度"
+  scale: "大小"
+  text: "文字"
+  position: "位置"
+  type: "類型"
+  image: "圖片"
+  advanced: "進階"
+  stripe: "條紋"
+  stripeWidth: "線條寬度"
+  stripeFrequency: "線條數量"
+  angle: "角度"
+  polkadot: "波卡圓點"
+  checker: "棋盤格"
+  polkadotMainDotOpacity: "主圓點的不透明度"
+  polkadotMainDotRadius: "主圓點的尺寸"
+  polkadotSubDotOpacity: "子圓點的不透明度"
+  polkadotSubDotRadius: "子圓點的尺寸"
+  polkadotSubDotDivisions: "子圓點的數量"
+_imageEffector:
+  title: "特效"
+  addEffect: "新增特效"
+  discardChangesConfirm: "捨棄更改並退出嗎？"
+  _fxs:
+    chromaticAberration: "色差"
+    glitch: "異常雜訊效果"
+    mirror: "鏡像"
+    invert: "反轉色彩"
+    grayscale: "黑白"
+    colorAdjust: "色彩校正"
+    colorClamp: "壓縮色彩"
+    colorClampAdvanced: "壓縮色彩（進階）"
+    distort: "變形"
+    threshold: "閾值"
+    zoomLines: "速度線"
+    stripe: "條紋"
+    polkadot: "波卡圓點"
+    checker: "棋盤格"
+    blockNoise: "阻擋雜訊"
+    tearing: "撕裂"
+drafts: "草稿\n"
+_drafts:
+  select: "選擇草槁"
+  cannotCreateDraftAnymore: "已超出可建立的草稿數量上限。\n"
+  cannotCreateDraft: "無法以此內容建立草稿。\n"
+  delete: "刪除草稿"
+  deleteAreYouSure: "確定要刪除草稿嗎？\n"
+  noDrafts: "沒有草稿。\n"
+  replyTo: "回覆給 {user}\n"
+  quoteOf: "引用自 {user} 的貼文\n"
+  postTo: "發佈到 {channel}\n"
+  saveToDraft: "儲存為草稿"
+  restoreFromDraft: "從草稿復原\n"
+  restore: "還原"
+  listDrafts: "草稿清單"
@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2025.5.1-beta.5",
+	"version": "2025.8.0-alpha.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@10.11.0",
+	"packageManager": "pnpm@10.13.1",
 	"workspaces": [
 		"packages/frontend-shared",
 		"packages/frontend",
@@ -52,29 +52,29 @@
 		"lodash": "4.17.21"
 	},
 	"dependencies": {
-		"cssnano": "7.0.7",
-		"esbuild": "0.25.4",
-		"execa": "9.5.3",
+		"cssnano": "7.1.0",
+		"esbuild": "0.25.6",
+		"execa": "9.6.0",
 		"fast-glob": "3.3.3",
-		"glob": "11.0.2",
+		"glob": "11.0.3",
 		"ignore-walk": "7.0.0",
 		"js-yaml": "4.1.0",
-		"postcss": "8.5.3",
+		"postcss": "8.5.6",
 		"tar": "7.4.3",
-		"terser": "5.39.2",
+		"terser": "5.43.1",
 		"typescript": "5.8.3"
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "2.1.0",
-		"@types/node": "22.15.21",
-		"@typescript-eslint/eslint-plugin": "8.32.1",
-		"@typescript-eslint/parser": "8.32.1",
+		"@types/node": "22.16.4",
+		"@typescript-eslint/eslint-plugin": "8.37.0",
+		"@typescript-eslint/parser": "8.37.0",
 		"cross-env": "7.0.3",
-		"cypress": "14.4.0",
-		"eslint": "9.27.0",
-		"globals": "16.1.0",
+		"cypress": "14.5.2",
+		"eslint": "9.31.0",
+		"globals": "16.3.0",
 		"ncp": "2.0.0",
-		"pnpm": "10.11.0",
+		"pnpm": "10.13.1",
 		"start-server-and-test": "2.0.12"
 	},
 	"optionalDependencies": {
@@ -83,6 +83,9 @@
 	"pnpm": {
 		"overrides": {
 			"@aiscript-dev/aiscript-languageserver": "-"
+		},
+		"patchedDependencies": {
+			"typeorm": "patches/typeorm.patch"
 		}
 	}
 }
@@ -25,6 +25,7 @@ export default [
 			},
 		},
 		rules: {
+			'@typescript-eslint/no-unused-vars': 'off',
 			'import/order': ['warn', {
 				groups: [
 					'builtin',
@@ -0,0 +1,91 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class CreateNoteDraft1736686850345 {
+    name = 'CreateNoteDraft1736686850345'
+
+    async up(queryRunner) {
+			await queryRunner.query(`
+				CREATE TABLE "note_draft" (
+					"id" varchar NOT NULL,
+					"replyId" varchar NULL,
+					"renoteId" varchar NULL,
+					"text" text NULL,
+					"cw" varchar(512) NULL,
+					"userId" varchar NOT NULL,
+					"localOnly" boolean DEFAULT false,
+					"reactionAcceptance" varchar(64) NULL,
+					"visibility" varchar NOT NULL,
+					"fileIds" varchar[] DEFAULT '{}',
+					"visibleUserIds" varchar[] DEFAULT '{}',
+					"hashtag" varchar(128) NULL,
+					"channelId" varchar NULL,
+					"hasPoll" boolean DEFAULT false,
+					"pollChoices" varchar(256)[] DEFAULT '{}',
+					"pollMultiple" boolean NULL,
+					"pollExpiresAt" TIMESTAMP WITH TIME ZONE NULL,
+					"pollExpiredAfter" bigint NULL,
+					PRIMARY KEY ("id")
+				)`);
+
+			await queryRunner.query(`
+				CREATE INDEX "IDX_NOTE_DRAFT_REPLY_ID" ON "note_draft" ("replyId")
+			`);
+
+			await queryRunner.query(`
+				CREATE INDEX "IDX_NOTE_DRAFT_RENOTE_ID" ON "note_draft" ("renoteId")
+			`);
+
+			await queryRunner.query(`
+				CREATE INDEX "IDX_NOTE_DRAFT_USER_ID" ON "note_draft" ("userId")
+			`);
+
+			await queryRunner.query(`
+				CREATE INDEX "IDX_NOTE_DRAFT_FILE_IDS" ON "note_draft" USING GIN ("fileIds")
+			`);
+
+			await queryRunner.query(`
+				CREATE INDEX "IDX_NOTE_DRAFT_VISIBLE_USER_IDS" ON "note_draft" USING GIN ("visibleUserIds")
+			`);
+
+			await queryRunner.query(`
+				CREATE INDEX "IDX_NOTE_DRAFT_CHANNEL_ID" ON "note_draft" ("channelId")
+			`);
+
+			await queryRunner.query(`
+				ALTER TABLE "note_draft"
+				ADD CONSTRAINT "FK_NOTE_DRAFT_REPLY_ID" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE
+			`);
+
+			await queryRunner.query(`
+				ALTER TABLE "note_draft"
+				ADD CONSTRAINT "FK_NOTE_DRAFT_RENOTE_ID" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE
+			`);
+
+			await queryRunner.query(`
+				ALTER TABLE "note_draft"
+				ADD CONSTRAINT "FK_NOTE_DRAFT_USER_ID" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE
+			`);
+
+			await queryRunner.query(`
+				ALTER TABLE "note_draft"
+				ADD CONSTRAINT "FK_NOTE_DRAFT_CHANNEL_ID" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE
+			`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_CHANNEL_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_USER_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_RENOTE_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_REPLY_ID"`);
+			await queryRunner.query(`DROP INDEX "IDX_NOTE_DRAFT_CHANNEL_ID"`);
+			await queryRunner.query(`DROP INDEX "IDX_NOTE_DRAFT_VISIBLE_USER_IDS"`);
+			await queryRunner.query(`DROP INDEX "IDX_NOTE_DRAFT_FILE_IDS"`);
+			await queryRunner.query(`DROP INDEX "IDX_NOTE_DRAFT_USER_ID"`);
+			await queryRunner.query(`DROP INDEX "IDX_NOTE_DRAFT_RENOTE_ID"`);
+			await queryRunner.query(`DROP INDEX "IDX_NOTE_DRAFT_REPLY_ID"`);
+			await queryRunner.query(`DROP TABLE "note_draft"`);
+    }
+}
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+export class FixAvatarUrl1750729939704 {
+    name = 'FixAvatarUrl1750729939704'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "avatarUrl" TYPE character varying(1024)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "avatarUrl" TYPE character varying(512)`);
+    }
+}
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class NoActionOnDraftRelation1752502434151 {
+    name = 'NoActionOnDraftRelation1752502434151'
+
+    async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_CHANNEL_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_USER_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_RENOTE_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_NOTE_DRAFT_REPLY_ID"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" ADD CONSTRAINT "FK_e4983f28b4b18b03491536052f5" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "note_draft" DROP CONSTRAINT "FK_e4983f28b4b18b03491536052f5"`);
+			await queryRunner.query(`ALTER TABLE "note_draft" ADD CONSTRAINT "FK_NOTE_DRAFT_REPLY_ID" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+			await queryRunner.query(`ALTER TABLE "note_draft" ADD CONSTRAINT "FK_NOTE_DRAFT_RENOTE_ID" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+			await queryRunner.query(`ALTER TABLE "note_draft" ADD CONSTRAINT "FK_NOTE_DRAFT_USER_ID" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+			await queryRunner.query(`ALTER TABLE "note_draft" ADD CONSTRAINT "FK_NOTE_DRAFT_CHANNEL_ID" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+}
@@ -0,0 +1,79 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class MigrationCleanup1752509043847 {
+    name = 'MigrationCleanup1752509043847'
+
+    async up(queryRunner) {
+        // 1745378064470-composite-note-index.js created a index ON "note" ("userId", "id" DESC) as IDX_724b311e6f883751f261ebe378 but should be named IDX_a6f649630f55af3888e5a42919
+        await queryRunner.query(`ALTER INDEX "IDX_724b311e6f883751f261ebe378" RENAME TO "IDX_a6f649630f55af3888e5a42919"`);
+
+        // 1713656541000-abuse-report-notification.js generated system_webhook with hand-written SQL with CURRENT_TIMESTAMP as the default value, but its representation in TypeORM is `now()`
+        // see https://github.com/typeorm/typeorm/blob/f351757a15b9d2bd9d4222c69dcfd2316f46b5d1/src/driver/postgres/PostgresDriver.ts#L1575
+        await queryRunner.query(`ALTER TABLE "system_webhook" ALTER COLUMN "updatedAt" SET DEFAULT now()`);
+
+        // 1702718871541-ffVisibility.js defined a enum type "user_profile_followersVisibility_enum" but it should be "user_profile_followersvisibility_enum" (lowercase 'v') in typeorm
+        await queryRunner.query(`ALTER TYPE "public"."user_profile_followersVisibility_enum" RENAME TO "user_profile_followersvisibility_enum"`);
+
+        // 1713656541000-abuse-report-notification.js generated abuse_report_notification_recipient with hand-written SQL with CURRENT_TIMESTAMP as the default value, but its representation in TypeORM is `now()`
+        await queryRunner.query(`ALTER TABLE "abuse_report_notification_recipient" ALTER COLUMN "updatedAt" SET DEFAULT now()`);
+
+        // 1690796169261-play-visibility.js added visibility column to flash table but it forgot to set NOT NULL constraint
+        await queryRunner.query(`ALTER TABLE "flash" ALTER COLUMN "visibility" SET NOT NULL`);
+
+        // 1736686850345-createNoteDraft.js created note_draft with hand-written SQL but several types and comments are not correctly defined
+        await queryRunner.query(`CREATE TYPE "public"."note_draft_visibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "id" SET DATA TYPE character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "replyId" SET DATA TYPE character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "renoteId" SET DATA TYPE character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "userId" SET DATA TYPE character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "channelId" SET DATA TYPE character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "fileIds" SET DATA TYPE character varying(32) array`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "visibleUserIds" SET DATA TYPE character varying(32) array`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "visibility" SET DATA TYPE "public"."note_draft_visibility_enum" USING visibility::note_draft_visibility_enum`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."replyId" IS 'The ID of reply target.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."renoteId" IS 'The ID of renote target.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."userId" IS 'The ID of author.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."channelId" IS 'The ID of source channel.'`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "fileIds" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "hasPoll" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "pollChoices" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "pollMultiple" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "localOnly" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "visibleUserIds" SET NOT NULL`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "visibleUserIds" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "localOnly" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "pollMultiple" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "pollChoices" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "hasPoll" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "fileIds" DROP NOT NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."channelId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."userId" IS 'The ID of author.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."renoteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_draft"."replyId" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "visibility" SET DATA TYPE varchar`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "visibleUserIds" SET DATA TYPE varchar[]`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "fileIds" SET DATA TYPE varchar[]`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "channelId" SET DATA TYPE varchar`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "userId" SET DATA TYPE varchar`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "renoteId" SET DATA TYPE varchar`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "replyId" SET DATA TYPE varchar`);
+        await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "id" SET DATA TYPE varchar`);
+        await queryRunner.query(`DROP TYPE "public"."note_draft_visibility_enum"`);
+
+        await queryRunner.query(`ALTER TABLE "flash" ALTER COLUMN "visibility" DROP NOT NULL`);
+
+        await queryRunner.query(`ALTER TABLE "abuse_report_notification_recipient" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP`);
+
+        await queryRunner.query(`ALTER TYPE "public"."user_profile_followersvisibility_enum" RENAME TO "user_profile_followersVisibility_enum"`);
+
+        await queryRunner.query(`ALTER TABLE "system_webhook" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP`);
+
+        await queryRunner.query(`ALTER INDEX "IDX_a6f649630f55af3888e5a42919" RENAME TO "IDX_724b311e6f883751f261ebe378"`);
+    }
+}
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class RemoteNotesCleaning1753863104203 {
+    name = 'RemoteNotesCleaning1753863104203'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableRemoteNotesCleaning" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query('ALTER TABLE "meta" ADD "remoteNotesCleaningMaxProcessingDurationInMinutes" integer NOT NULL DEFAULT \'60\'');
+		await queryRunner.query('ALTER TABLE "meta" ADD "remoteNotesCleaningExpiryDaysForEachNotes" integer NOT NULL DEFAULT \'90\'');
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query('ALTER TABLE "meta" DROP COLUMN "remoteNotesCleaningExpiryDaysForEachNotes"');
+		await queryRunner.query('ALTER TABLE "meta" DROP COLUMN "remoteNotesCleaningMaxProcessingDurationInMinutes"');
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableRemoteNotesCleaning"`);
+    }
+}
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class RemoveNoteConstraints1753868431598 {
+    name = 'RemoveNoteConstraints1753868431598'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_52ccc804d7c69037d558bac4c96"`);
+        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_52ccc804d7c69037d558bac4c96" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+}
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class TweakDefaultFederationSettings1754019326356 {
+    name = 'TweakDefaultFederationSettings1754019326356'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "federation" SET DEFAULT 'none'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "federation" SET DEFAULT 'all'`);
+    }
+}
@@ -4,7 +4,7 @@
 	"private": true,
 	"type": "module",
 	"engines": {
-		"node": "^20.10.0 || ^22.0.0"
+		"node": "^22.15.0"
 	},
 	"scripts": {
 		"start": "node ./built/boot/entry.js",
@@ -33,21 +33,22 @@
 		"test:fed": "pnpm jest:fed",
 		"test-and-coverage": "pnpm jest-and-coverage",
 		"test-and-coverage:e2e": "pnpm build && pnpm build:test && pnpm jest-and-coverage:e2e",
+		"check-migrations": "node scripts/check_migrations_clean.js",
 		"generate-api-json": "node ./scripts/generate_api_json.js"
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
-		"@swc/core-darwin-arm64": "1.11.29",
-		"@swc/core-darwin-x64": "1.11.29",
+		"@swc/core-darwin-arm64": "1.12.0",
+		"@swc/core-darwin-x64": "1.12.0",
 		"@swc/core-freebsd-x64": "1.3.11",
-		"@swc/core-linux-arm-gnueabihf": "1.11.29",
-		"@swc/core-linux-arm64-gnu": "1.11.29",
-		"@swc/core-linux-arm64-musl": "1.11.29",
-		"@swc/core-linux-x64-gnu": "1.11.29",
-		"@swc/core-linux-x64-musl": "1.11.29",
-		"@swc/core-win32-arm64-msvc": "1.11.29",
-		"@swc/core-win32-ia32-msvc": "1.11.29",
-		"@swc/core-win32-x64-msvc": "1.11.29",
+		"@swc/core-linux-arm-gnueabihf": "1.12.0",
+		"@swc/core-linux-arm64-gnu": "1.12.0",
+		"@swc/core-linux-arm64-musl": "1.12.0",
+		"@swc/core-linux-x64-gnu": "1.12.0",
+		"@swc/core-linux-x64-musl": "1.12.0",
+		"@swc/core-win32-arm64-msvc": "1.12.0",
+		"@swc/core-win32-ia32-msvc": "1.12.0",
+		"@swc/core-win32-x64-msvc": "1.12.0",
 		"@tensorflow/tfjs": "4.22.0",
 		"@tensorflow/tfjs-node": "4.22.0",
 		"bufferutil": "4.0.9",
@@ -67,9 +68,9 @@
 		"utf-8-validate": "6.0.5"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.817.0",
-		"@aws-sdk/lib-storage": "3.817.0",
-		"@discordapp/twemoji": "15.1.0",
+		"@aws-sdk/client-s3": "3.826.0",
+		"@aws-sdk/lib-storage": "3.826.0",
+		"@discordapp/twemoji": "16.0.1",
 		"@fastify/accepts": "5.0.2",
 		"@fastify/cookie": "11.0.2",
 		"@fastify/cors": "10.1.0",
@@ -80,10 +81,10 @@
 		"@fastify/view": "10.0.2",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.2.1",
-		"@napi-rs/canvas": "0.1.70",
-		"@nestjs/common": "11.1.2",
-		"@nestjs/core": "11.1.2",
-		"@nestjs/testing": "11.1.2",
+		"@napi-rs/canvas": "0.1.71",
+		"@nestjs/common": "11.1.3",
+		"@nestjs/core": "11.1.3",
+		"@nestjs/testing": "11.1.3",
 		"@peertube/http-signature": "1.7.0",
 		"@sentry/node": "8.55.0",
 		"@sentry/profiling-node": "8.55.0",
@@ -91,8 +92,8 @@
 		"@sinonjs/fake-timers": "11.3.1",
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.7.7",
-		"@swc/core": "1.11.29",
-		"@twemoji/parser": "15.1.1",
+		"@swc/core": "1.12.0",
+		"@twemoji/parser": "16.0.0",
 		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
@@ -101,7 +102,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.3",
-		"bullmq": "5.53.0",
+		"bullmq": "5.53.2",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.4.1",
@@ -117,7 +118,7 @@
 		"feed": "4.2.2",
 		"file-type": "19.6.0",
 		"fluent-ffmpeg": "2.1.3",
-		"form-data": "4.0.2",
+		"form-data": "4.0.3",
 		"got": "14.4.7",
 		"happy-dom": "16.8.1",
 		"hpagent": "1.2.0",
@@ -133,9 +134,9 @@
 		"jsonld": "8.3.3",
 		"jsrsasign": "11.1.0",
 		"juice": "11.0.1",
-		"meilisearch": "0.50.0",
-		"mfm-js": "0.24.0",
-		"microformats-parser": "2.0.2",
+		"meilisearch": "0.51.0",
+		"mfm-js": "0.25.0",
+		"microformats-parser": "2.0.3",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
@@ -188,16 +189,16 @@
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@nestjs/platform-express": "10.4.18",
-		"@sentry/vue": "9.22.0",
+		"@nestjs/platform-express": "10.4.19",
+		"@sentry/vue": "9.28.0",
 		"@simplewebauthn/types": "12.0.0",
 		"@swc/jest": "0.2.38",
 		"@types/accepts": "1.3.7",
 		"@types/archiver": "6.0.3",
 		"@types/bcryptjs": "2.4.6",
-		"@types/body-parser": "1.19.5",
+		"@types/body-parser": "1.19.6",
 		"@types/color-convert": "2.0.4",
-		"@types/content-disposition": "0.5.8",
+		"@types/content-disposition": "0.5.9",
 		"@types/fluent-ffmpeg": "2.1.27",
 		"@types/htmlescape": "1.1.3",
 		"@types/http-link-header": "1.0.7",
@@ -208,12 +209,12 @@
 		"@types/jsrsasign": "10.5.15",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "22.15.21",
+		"@types/node": "22.15.31",
 		"@types/nodemailer": "6.4.17",
 		"@types/oauth": "0.9.6",
 		"@types/oauth2orize": "1.11.5",
 		"@types/oauth2orize-pkce": "0.1.2",
-		"@types/pg": "8.15.2",
+		"@types/pg": "8.15.4",
 		"@types/pug": "2.0.10",
 		"@types/qrcode": "1.5.5",
 		"@types/random-seed": "0.3.5",
@@ -229,8 +230,8 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.4",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.32.1",
-		"@typescript-eslint/parser": "8.32.1",
+		"@typescript-eslint/eslint-plugin": "8.34.0",
+		"@typescript-eslint/parser": "8.34.0",
 		"aws-sdk-client-mock": "4.1.0",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.31.0",
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+// This script checks if the database migrations has been generated correctly.
+
+import dataSource from '../ormconfig.js';
+
+await dataSource.initialize();
+
+const sqlInMemory = await dataSource.driver.createSchemaBuilder().log();
+
+if (sqlInMemory.upQueries.length > 0 || sqlInMemory.downQueries.length > 0) {
+	console.error('There are several pending migrations. Please make sure you have generated the migrations correctly, or configured entities class correctly.');
+	for (const query of sqlInMemory.upQueries) {
+		console.error(`- ${query.query}`);
+	}
+	for (const query of sqlInMemory.downQueries) {
+		console.error(`- ${query.query}`);
+	}
+	process.exit(1);
+} else {
+	console.log('All migrations are clean.');
+	process.exit(0);
+}
@@ -331,6 +331,16 @@ export class ChatService {
 		await redisPipeline.exec();
 	}

+	@bindThis
+	public async readAllChatMessages(
+		readerId: MiUser['id'],
+	): Promise<void> {
+		const redisPipeline = this.redisClient.pipeline();
+		// TODO: newUserChatMessageExists とか newRoomChatMessageExists も消したい(けどキーの列挙が必要になって面倒)
+		redisPipeline.del(`newChatMessagesExists:${readerId}`);
+		await redisPipeline.exec();
+	}
+
 	@bindThis
 	public findMessageById(messageId: MiChatMessage['id']) {
 		return this.chatMessagesRepository.findOneBy({ id: messageId });
@@ -44,6 +44,7 @@ import { ModerationLogService } from './ModerationLogService.js';
 import { NoteCreateService } from './NoteCreateService.js';
 import { NoteDeleteService } from './NoteDeleteService.js';
 import { NotePiningService } from './NotePiningService.js';
+import { NoteDraftService } from './NoteDraftService.js';
 import { NotificationService } from './NotificationService.js';
 import { PollService } from './PollService.js';
 import { PushNotificationService } from './PushNotificationService.js';
@@ -118,6 +119,7 @@ import { RenoteMutingEntityService } from './entities/RenoteMutingEntityService.
 import { NoteEntityService } from './entities/NoteEntityService.js';
 import { NoteFavoriteEntityService } from './entities/NoteFavoriteEntityService.js';
 import { NoteReactionEntityService } from './entities/NoteReactionEntityService.js';
+import { NoteDraftEntityService } from './entities/NoteDraftEntityService.js';
 import { NotificationEntityService } from './entities/NotificationEntityService.js';
 import { PageEntityService } from './entities/PageEntityService.js';
 import { PageLikeEntityService } from './entities/PageLikeEntityService.js';
@@ -185,6 +187,7 @@ const $ModerationLogService: Provider = { provide: 'ModerationLogService', useEx
 const $NoteCreateService: Provider = { provide: 'NoteCreateService', useExisting: NoteCreateService };
 const $NoteDeleteService: Provider = { provide: 'NoteDeleteService', useExisting: NoteDeleteService };
 const $NotePiningService: Provider = { provide: 'NotePiningService', useExisting: NotePiningService };
+const $NoteDraftService: Provider = { provide: 'NoteDraftService', useExisting: NoteDraftService };
 const $NotificationService: Provider = { provide: 'NotificationService', useExisting: NotificationService };
 const $PollService: Provider = { provide: 'PollService', useExisting: PollService };
 const $SystemAccountService: Provider = { provide: 'SystemAccountService', useExisting: SystemAccountService };
@@ -266,6 +269,7 @@ const $RenoteMutingEntityService: Provider = { provide: 'RenoteMutingEntityServi
 const $NoteEntityService: Provider = { provide: 'NoteEntityService', useExisting: NoteEntityService };
 const $NoteFavoriteEntityService: Provider = { provide: 'NoteFavoriteEntityService', useExisting: NoteFavoriteEntityService };
 const $NoteReactionEntityService: Provider = { provide: 'NoteReactionEntityService', useExisting: NoteReactionEntityService };
+const $NoteDraftEntityService: Provider = { provide: 'NoteDraftEntityService', useExisting: NoteDraftEntityService };
 const $NotificationEntityService: Provider = { provide: 'NotificationEntityService', useExisting: NotificationEntityService };
 const $PageEntityService: Provider = { provide: 'PageEntityService', useExisting: PageEntityService };
 const $PageLikeEntityService: Provider = { provide: 'PageLikeEntityService', useExisting: PageLikeEntityService };
@@ -335,6 +339,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		NoteCreateService,
 		NoteDeleteService,
 		NotePiningService,
+		NoteDraftService,
 		NotificationService,
 		PollService,
 		SystemAccountService,
@@ -416,6 +421,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		NoteEntityService,
 		NoteFavoriteEntityService,
 		NoteReactionEntityService,
+		NoteDraftEntityService,
 		NotificationEntityService,
 		PageEntityService,
 		PageLikeEntityService,
@@ -481,6 +487,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$NoteCreateService,
 		$NoteDeleteService,
 		$NotePiningService,
+		$NoteDraftService,
 		$NotificationService,
 		$PollService,
 		$SystemAccountService,
@@ -562,6 +569,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$NoteEntityService,
 		$NoteFavoriteEntityService,
 		$NoteReactionEntityService,
+		$NoteDraftEntityService,
 		$NotificationEntityService,
 		$PageEntityService,
 		$PageLikeEntityService,
@@ -628,6 +636,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		NoteCreateService,
 		NoteDeleteService,
 		NotePiningService,
+		NoteDraftService,
 		NotificationService,
 		PollService,
 		SystemAccountService,
@@ -708,6 +717,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		NoteEntityService,
 		NoteFavoriteEntityService,
 		NoteReactionEntityService,
+		NoteDraftEntityService,
 		NotificationEntityService,
 		PageEntityService,
 		PageLikeEntityService,
@@ -773,6 +783,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$NoteCreateService,
 		$NoteDeleteService,
 		$NotePiningService,
+		$NoteDraftService,
 		$NotificationService,
 		$PollService,
 		$SystemAccountService,
@@ -852,6 +863,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$NoteEntityService,
 		$NoteFavoriteEntityService,
 		$NoteReactionEntityService,
+		$NoteDraftEntityService,
 		$NotificationEntityService,
 		$PageEntityService,
 		$PageLikeEntityService,
@@ -803,14 +803,14 @@ export class DriveService {
 			await Promise.all(promises);
 		}

-		this.deletePostProcess(file, isExpired, deleter);
+		await this.deletePostProcess(file, isExpired, deleter);
 	}

 	@bindThis
 	private async deletePostProcess(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
 		// リモートファイル期限切れ削除後は直リンクにする
 		if (isExpired && file.userHost !== null && file.uri != null) {
-			this.driveFilesRepository.update(file.id, {
+			await this.driveFilesRepository.update(file.id, {
 				isLink: true,
 				url: file.uri,
 				thumbnailUrl: null,
@@ -822,7 +822,7 @@ export class DriveService {
 				webpublicAccessKey: 'webpublic-' + randomUUID(),
 			});
 		} else {
-			this.driveFilesRepository.delete(file.id);
+			await this.driveFilesRepository.delete(file.id);
 		}

 		this.driveChart.update(file, false);
@@ -145,7 +145,10 @@ export class EmailService {
 		try {
 			// TODO: htmlサニタイズ
 			const info = await transporter.sendMail({
-				from: this.meta.email!,
+				from: this.meta.name ? {
+					name: this.meta.name,
+					address: this.meta.email!,
+				} : this.meta.email!,
 				to: to,
 				subject: subject,
 				text: text,
@@ -20,6 +20,8 @@ import { CacheService } from '@/core/CacheService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';

+type NoteFilter = (note: MiNote) => boolean;
+
 type TimelineOptions = {
 	untilId: string | null,
 	sinceId: string | null,
@@ -28,7 +30,7 @@ type TimelineOptions = {
 	me?: { id: MiUser['id'] } | undefined | null,
 	useDbFallback: boolean,
 	redisTimelines: FanoutTimelineName[],
-	noteFilter?: (note: MiNote) => boolean,
+	noteFilter?: NoteFilter,
 	alwaysIncludeMyNotes?: boolean;
 	ignoreAuthorFromBlock?: boolean;
 	ignoreAuthorFromMute?: boolean;
@@ -79,7 +81,7 @@ export class FanoutTimelineEndpointService {
 		const shouldFallbackToDb = noteIds.length === 0 || ps.sinceId != null && ps.sinceId < oldestNoteId;

 		if (!shouldFallbackToDb) {
-			let filter = ps.noteFilter ?? (_note => true);
+			let filter = ps.noteFilter ?? (_note => true) as NoteFilter;

 			if (ps.alwaysIncludeMyNotes && ps.me) {
 				const me = ps.me;
@@ -145,15 +147,11 @@ export class FanoutTimelineEndpointService {
 			{
 				const parentFilter = filter;
 				filter = (note) => {
-					const noteJoined = note as MiNote & {
-						renoteUser: MiUser | null;
-						replyUser: MiUser | null;
-					};
 					if (!ps.ignoreAuthorFromUserSuspension) {
 						if (note.user!.isSuspended) return false;
 					}
-					if (note.userId !== note.renoteUserId && noteJoined.renoteUser?.isSuspended) return false;
-					if (note.userId !== note.replyUserId && noteJoined.replyUser?.isSuspended) return false;
+					if (note.userId !== note.renoteUserId && note.renote?.user?.isSuspended) return false;
+					if (note.userId !== note.replyUserId && note.reply?.user?.isSuspended) return false;

 					return parentFilter(note);
 				};
@@ -200,7 +198,7 @@ export class FanoutTimelineEndpointService {
 		return await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit);
 	}

-	private async getAndFilterFromDb(noteIds: string[], noteFilter: (note: MiNote) => boolean, idCompare: (a: string, b: string) => number): Promise<MiNote[]> {
+	private async getAndFilterFromDb(noteIds: string[], noteFilter: NoteFilter, idCompare: (a: string, b: string) => number): Promise<MiNote[]> {
 		const query = this.notesRepository.createQueryBuilder('note')
 			.where('note.id IN (:...noteIds)', { noteIds: noteIds })
 			.innerJoinAndSelect('note.user', 'user')
@@ -4,8 +4,11 @@
 */

 import { Inject, Injectable } from '@nestjs/common';
+import { Brackets } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import { type FlashsRepository } from '@/models/_.js';
+import { type FlashLikesRepository, MiUser, type FlashsRepository } from '@/models/_.js';
+import { QueryService } from '@/core/QueryService.js';
+import { sqlLikeEscape } from '@/misc/sql-like-escape.js';

 /**
 * MisskeyPlay関係のService
@@ -15,6 +18,11 @@ export class FlashService {
 	constructor(
 		@Inject(DI.flashsRepository)
 		private flashRepository: FlashsRepository,
+
+		@Inject(DI.flashLikesRepository)
+		private flashLikesRepository: FlashLikesRepository,
+
+		private queryService: QueryService,
 	) {
 	}

@@ -37,4 +45,43 @@ export class FlashService {

 		return await builder.getMany();
 	}
+
+	public async myLikes(meId: MiUser['id'], opts: { sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number, limit?: number, search?: string | null }) {
+		const query = this.queryService.makePaginationQuery(this.flashLikesRepository.createQueryBuilder('like'), opts.sinceId, opts.untilId, opts.sinceDate, opts.untilDate)
+			.andWhere('like.userId = :meId', { meId })
+			.leftJoinAndSelect('like.flash', 'flash');
+
+		if (opts.search != null) {
+			for (const word of opts.search.trim().split(' ')) {
+				query.andWhere(new Brackets(qb => {
+					qb.orWhere('flash.title ILIKE :search', { search: `%${sqlLikeEscape(word)}%` });
+					qb.orWhere('flash.summary ILIKE :search', { search: `%${sqlLikeEscape(word)}%` });
+				}));
+			}
+		}
+
+		const likes = await query
+			.limit(opts.limit)
+			.getMany();
+
+		return likes;
+	}
+
+	public async search(searchQuery: string, opts: { sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number, limit?: number }) {
+		const query = this.queryService.makePaginationQuery(this.flashRepository.createQueryBuilder('flash'), opts.sinceId, opts.untilId, opts.sinceDate, opts.untilDate)
+			.andWhere('flash.visibility = \'public\'');
+
+		for (const word of searchQuery.trim().split(' ')) {
+			query.andWhere(new Brackets(qb => {
+				qb.orWhere('flash.title ILIKE :search', { search: `%${sqlLikeEscape(word)}%` });
+				qb.orWhere('flash.summary ILIKE :search', { search: `%${sqlLikeEscape(word)}%` });
+			}));
+		}
+
+		const result = await query
+			.limit(opts.limit)
+			.getMany();
+
+		return result;
+	}
 }
@@ -421,7 +421,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			emojis,
 			userId: user.id,
 			localOnly: data.localOnly!,
-			reactionAcceptance: data.reactionAcceptance,
+			reactionAcceptance: data.reactionAcceptance ?? null,
 			visibility: data.visibility as any,
 			visibleUserIds: data.visibility === 'specified'
 				? data.visibleUsers
@@ -483,7 +483,11 @@ export class NoteCreateService implements OnApplicationShutdown {
 				await this.notesRepository.insert(insert);
 			}

-			return insert;
+			return {
+				...insert,
+				reply: data.reply ?? null,
+				renote: data.renote ?? null,
+			};
 		} catch (e) {
 			// duplicate key error
 			if (isDuplicateKeyValueError(e)) {
@@ -62,7 +62,6 @@ export class NoteDeleteService {
 	 */
 	async delete(user: { id: MiUser['id']; uri: MiUser['uri']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, quiet = false, deleter?: MiUser) {
 		const deletedAt = new Date();
-		const cascadingNotes = await this.findCascadingNotes(note);

 		if (note.replyId) {
 			await this.notesRepository.decrement({ id: note.replyId }, 'repliesCount', 1);
@@ -90,15 +89,6 @@ export class NoteDeleteService {

 				this.deliverToConcerned(user, note, content);
 			}
-
-			// also deliver delete activity to cascaded notes
-			const federatedLocalCascadingNotes = (cascadingNotes).filter(note => !note.localOnly && note.userHost == null); // filter out local-only notes
-			for (const cascadingNote of federatedLocalCascadingNotes) {
-				if (!cascadingNote.user) continue;
-				if (!this.userEntityService.isLocalUser(cascadingNote.user)) continue;
-				const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.apRendererService.renderTombstone(`${this.config.url}/notes/${cascadingNote.id}`), cascadingNote.user));
-				this.deliverToConcerned(cascadingNote.user, cascadingNote, content);
-			}
 			//#endregion

 			this.notesChart.update(note, false);
@@ -118,9 +108,6 @@ export class NoteDeleteService {
 			}
 		}

-		for (const cascadingNote of cascadingNotes) {
-			this.searchService.unindexNote(cascadingNote);
-		}
 		this.searchService.unindexNote(note);

 		await this.notesRepository.delete({
@@ -140,29 +127,6 @@ export class NoteDeleteService {
 		}
 	}

-	@bindThis
-	private async findCascadingNotes(note: MiNote): Promise<MiNote[]> {
-		const recursive = async (noteId: string): Promise<MiNote[]> => {
-			const query = this.notesRepository.createQueryBuilder('note')
-				.where('note.replyId = :noteId', { noteId })
-				.orWhere(new Brackets(q => {
-					q.where('note.renoteId = :noteId', { noteId })
-						.andWhere('note.text IS NOT NULL');
-				}))
-				.leftJoinAndSelect('note.user', 'user');
-			const replies = await query.getMany();
-
-			return [
-				replies,
-				...await Promise.all(replies.map(reply => recursive(reply.id))),
-			].flat();
-		};
-
-		const cascadingNotes: MiNote[] = await recursive(note.id);
-
-		return cascadingNotes;
-	}
-
 	@bindThis
 	private async getMentionedRemoteUsers(note: MiNote) {
 		const where = [] as any[];
@@ -0,0 +1,314 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { In } from 'typeorm';
+import type { noteVisibilities, noteReactionAcceptances } from '@/types.js';
+import { DI } from '@/di-symbols.js';
+import type { MiNoteDraft, NoteDraftsRepository, MiNote, MiDriveFile, MiChannel, UsersRepository, DriveFilesRepository, NotesRepository, BlockingsRepository, ChannelsRepository } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { RoleService } from '@/core/RoleService.js';
+import { IdService } from '@/core/IdService.js';
+import type { MiLocalUser, MiUser } from '@/models/User.js';
+import { IPoll } from '@/models/Poll.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { isRenote, isQuote } from '@/misc/is-renote.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+
+export type NoteDraftOptions = {
+	replyId?: MiNote['id'] | null;
+	renoteId?: MiNote['id'] | null;
+	text?: string | null;
+	cw?: string | null;
+	localOnly?: boolean | null;
+	reactionAcceptance?: typeof noteReactionAcceptances[number];
+	visibility?: typeof noteVisibilities[number];
+	fileIds?: MiDriveFile['id'][];
+	visibleUserIds?: MiUser['id'][];
+	hashtag?: string;
+	channelId?: MiChannel['id'] | null;
+	poll?: (IPoll & { expiredAfter?: number | null }) | null;
+};
+
+@Injectable()
+export class NoteDraftService {
+	constructor(
+		@Inject(DI.blockingsRepository)
+		private blockingsRepository: BlockingsRepository,
+
+		@Inject(DI.noteDraftsRepository)
+		private noteDraftsRepository: NoteDraftsRepository,
+
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		@Inject(DI.driveFilesRepository)
+		private driveFilesRepository: DriveFilesRepository,
+
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
+
+		private roleService: RoleService,
+		private idService: IdService,
+		private noteEntityService: NoteEntityService,
+	) {
+	}
+
+	@bindThis
+	public async get(me: MiLocalUser, draftId: MiNoteDraft['id']): Promise<MiNoteDraft | null> {
+		const draft = await this.noteDraftsRepository.findOneBy({
+			id: draftId,
+			userId: me.id,
+		});
+
+		return draft;
+	}
+
+	@bindThis
+	public async create(me: MiLocalUser, data: NoteDraftOptions): Promise<MiNoteDraft> {
+		//#region check draft limit
+
+		const currentCount = await this.noteDraftsRepository.countBy({
+			userId: me.id,
+		});
+		if (currentCount >= (await this.roleService.getUserPolicies(me.id)).noteDraftLimit) {
+			throw new IdentifiableError('9ee33bbe-fde3-4c71-9b51-e50492c6b9c8', 'Too many drafts');
+		}
+		//#endregion
+
+		if (data.poll) {
+			if (typeof data.poll.expiresAt === 'number') {
+				if (data.poll.expiresAt < Date.now()) {
+					throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
+				}
+			} else if (typeof data.poll.expiredAfter === 'number') {
+				data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
+			}
+		}
+
+		const appliedDraft = await this.checkAndSetDraftNoteOptions(me, this.noteDraftsRepository.create(), data);
+
+		appliedDraft.id = this.idService.gen();
+		appliedDraft.userId = me.id;
+		const draft = this.noteDraftsRepository.save(appliedDraft);
+
+		return draft;
+	}
+
+	@bindThis
+	public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: NoteDraftOptions): Promise<MiNoteDraft> {
+		const draft = await this.noteDraftsRepository.findOneBy({
+			id: draftId,
+			userId: me.id,
+		});
+
+		if (draft == null) {
+			throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
+		}
+
+		if (data.poll) {
+			if (typeof data.poll.expiresAt === 'number') {
+				if (data.poll.expiresAt < Date.now()) {
+					throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
+				}
+			} else if (typeof data.poll.expiredAfter === 'number') {
+				data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
+			}
+		}
+
+		const appliedDraft = await this.checkAndSetDraftNoteOptions(me, draft, data);
+
+		return await this.noteDraftsRepository.save(appliedDraft);
+	}
+
+	@bindThis
+	public async delete(me: MiLocalUser, draftId: MiNoteDraft['id']): Promise<void> {
+		const draft = await this.noteDraftsRepository.findOneBy({
+			id: draftId,
+			userId: me.id,
+		});
+
+		if (draft == null) {
+			throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
+		}
+
+		await this.noteDraftsRepository.delete(draft.id);
+	}
+
+	@bindThis
+	public async getDraft(me: MiLocalUser, draftId: MiNoteDraft['id']): Promise<MiNoteDraft> {
+		const draft = await this.noteDraftsRepository.findOneBy({
+			id: draftId,
+			userId: me.id,
+		});
+
+		if (draft == null) {
+			throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
+		}
+
+		return draft;
+	}
+
+	// 関連エンティティを取得し紐づける部分を共通化する
+	@bindThis
+	public async checkAndSetDraftNoteOptions(
+		me: MiLocalUser,
+		draft: MiNoteDraft,
+		data: NoteDraftOptions,
+	): Promise<MiNoteDraft> {
+		data.visibility ??= 'public';
+		data.localOnly ??= false;
+		if (data.reactionAcceptance === undefined) data.reactionAcceptance = null;
+		if (data.channelId != null) {
+			data.visibility = 'public';
+			data.visibleUserIds = [];
+			data.localOnly = true;
+		}
+
+		let appliedDraft = draft;
+
+		//#region visibleUsers
+		let visibleUsers: MiUser[] = [];
+		if (data.visibleUserIds != null) {
+			visibleUsers = await this.usersRepository.findBy({
+				id: In(data.visibleUserIds),
+			});
+		}
+		//#endregion
+
+		//#region files
+		let files: MiDriveFile[] = [];
+		const fileIds = data.fileIds ?? null;
+		if (fileIds != null) {
+			files = await this.driveFilesRepository.createQueryBuilder('file')
+				.where('file.userId = :userId AND file.id IN (:...fileIds)', {
+					userId: me.id,
+					fileIds: fileIds,
+				})
+				.orderBy('array_position(ARRAY[:...fileIds], "id"::text)')
+				.setParameters({ fileIds })
+				.getMany();
+
+			if (files.length !== fileIds.length) {
+				throw new IdentifiableError('b6992544-63e7-67f0-fa7f-32444b1b5306', 'No such drive file');
+			}
+		}
+		//#endregion
+
+		//#region renote
+		let renote: MiNote | null = null;
+		if (data.renoteId != null) {
+			renote = await this.notesRepository.findOneBy({ id: data.renoteId });
+
+			if (renote == null) {
+				throw new IdentifiableError('64929870-2540-4d11-af41-3b484d78c956', 'No such renote');
+			} else if (isRenote(renote) && !isQuote(renote)) {
+				throw new IdentifiableError('76cc5583-5a14-4ad3-8717-0298507e32db', 'Cannot renote');
+			}
+
+			// Check blocking
+			if (renote.userId !== me.id) {
+				const blockExist = await this.blockingsRepository.exists({
+					where: {
+						blockerId: renote.userId,
+						blockeeId: me.id,
+					},
+				});
+				if (blockExist) {
+					throw new IdentifiableError('075ca298-e6e7-485a-b570-51a128bb5168', 'You have been blocked by the user');
+				}
+			}
+
+			if (renote.visibility === 'followers' && renote.userId !== me.id) {
+				// 他人のfollowers noteはreject
+				throw new IdentifiableError('81eb8188-aea1-4e35-9a8f-3334a3be9855', 'Cannot Renote Due to Visibility');
+			} else if (renote.visibility === 'specified') {
+				// specified / direct noteはreject
+				throw new IdentifiableError('81eb8188-aea1-4e35-9a8f-3334a3be9855', 'Cannot Renote Due to Visibility');
+			}
+
+			if (renote.channelId && renote.channelId !== data.channelId) {
+				// チャンネルのノートに対しリノート要求がきたとき、チャンネル外へのリノート可否をチェック
+				// リノートのユースケースのうち、チャンネル内→チャンネル外は少数だと考えられるため、JOINはせず必要な時に都度取得する
+				const renoteChannel = await this.channelsRepository.findOneBy({ id: renote.channelId });
+				if (renoteChannel == null) {
+					// リノートしたいノートが書き込まれているチャンネルがない
+					throw new IdentifiableError('6815399a-6f13-4069-b60d-ed5156249d12', 'No such channel');
+				} else if (!renoteChannel.allowRenoteToExternal) {
+					// リノート作成のリクエストだが、対象チャンネルがリノート禁止だった場合
+					throw new IdentifiableError('ed1952ac-2d26-4957-8b30-2deda76bedf7', 'Cannot Renote to External');
+				}
+			}
+		}
+		//#endregion
+
+		//#region reply
+		let reply: MiNote | null = null;
+		if (data.replyId != null) {
+			// Fetch reply
+			reply = await this.notesRepository.findOneBy({ id: data.replyId });
+
+			if (reply == null) {
+				throw new IdentifiableError('c4721841-22fc-4bb7-ad3d-897ef1d375b5', 'No such reply');
+			} else if (isRenote(reply) && !isQuote(reply)) {
+				throw new IdentifiableError('e6c10b57-2c09-4da3-bd4d-eda05d51d140', 'Cannot reply To Pure Renote');
+			} else if (!await this.noteEntityService.isVisibleForMe(reply, me.id)) {
+				throw new IdentifiableError('593c323c-6b6a-4501-a25c-2f36bd2a93d6', 'Cannot reply To Invisible Note');
+			} else if (reply.visibility === 'specified' && data.visibility !== 'specified') {
+				throw new IdentifiableError('215dbc76-336c-4d2a-9605-95766ba7dab0', 'Cannot reply To Specified Note With Extended Visibility');
+			}
+
+			// Check blocking
+			if (reply.userId !== me.id) {
+				const blockExist = await this.blockingsRepository.exists({
+					where: {
+						blockerId: reply.userId,
+						blockeeId: me.id,
+					},
+				});
+				if (blockExist) {
+					throw new IdentifiableError('075ca298-e6e7-485a-b570-51a128bb5168', 'You have been blocked by the user');
+				}
+			}
+		}
+		//#endregion
+
+		//#region channel
+		let channel: MiChannel | null = null;
+		if (data.channelId != null) {
+			channel = await this.channelsRepository.findOneBy({ id: data.channelId, isArchived: false });
+
+			if (channel == null) {
+				throw new IdentifiableError('6815399a-6f13-4069-b60d-ed5156249d12', 'No such channel');
+			}
+		}
+		//#endregion
+
+		appliedDraft = {
+			...appliedDraft,
+			visibility: data.visibility,
+			cw: data.cw ?? null,
+			fileIds: fileIds ?? [],
+			replyId: data.replyId ?? null,
+			renoteId: data.renoteId ?? null,
+			channelId: data.channelId ?? null,
+			text: data.text ?? null,
+			hashtag: data.hashtag ?? null,
+			hasPoll: data.poll != null,
+			pollChoices: data.poll ? data.poll.choices : [],
+			pollMultiple: data.poll ? data.poll.multiple : false,
+			pollExpiresAt: data.poll ? data.poll.expiresAt : null,
+			pollExpiredAfter: data.poll ? data.poll.expiredAfter ?? null : null,
+			visibleUserIds: data.visibleUserIds ?? [],
+			localOnly: data.localOnly,
+			reactionAcceptance: data.reactionAcceptance,
+		} satisfies MiNoteDraft;
+
+		return appliedDraft;
+	}
+}
@@ -360,7 +360,7 @@ export class QueryService {
 	public generateSuspendedUserQueryForNote(q: SelectQueryBuilder<any>, excludeAuthor?: boolean): void {
 		if (excludeAuthor) {
 			const brakets = (user: string) => new Brackets(qb => qb
-				.where(`note.${user}Id IS NULL`)
+				.where(`${user}.id IS NULL`) // そもそもreplyやrenoteではない、もしくはleftjoinなどでuserが存在しなかった場合を考慮
 				.orWhere(`user.id = ${user}.id`)
 				.orWhere(`${user}.isSuspended = FALSE`));
 			q
@@ -368,7 +368,7 @@ export class QueryService {
 				.andWhere(brakets('renoteUser'));
 		} else {
 			const brakets = (user: string) => new Brackets(qb => qb
-				.where(`note.${user}Id IS NULL`)
+				.where(`${user}.id IS NULL`) // そもそもreplyやrenoteではない、もしくはleftjoinなどでuserが存在しなかった場合を考慮
 				.orWhere(`${user}.isSuspended = FALSE`));
 			q
 				.andWhere('user.isSuspended = FALSE')
@@ -17,6 +17,7 @@ import { bindThis } from '@/decorators.js';
 import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
 import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
 import { type SystemWebhookPayload } from '@/core/SystemWebhookService.js';
+import type { Packed } from '@/misc/json-schema.js';
 import { type UserWebhookPayload } from './UserWebhookService.js';
 import type {
 	DbJobData,
@@ -39,7 +40,6 @@ import type {
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
-import type { Packed } from '@/misc/json-schema.js';

 export const QUEUE_TYPES = [
 	'system',
@@ -53,6 +53,37 @@ export const QUEUE_TYPES = [
 	'systemWebhookDeliver',
 ] as const;

+const REPEATABLE_SYSTEM_JOB_DEF = [{
+	name: 'tickCharts',
+	pattern: '55 * * * *',
+}, {
+	name: 'resyncCharts',
+	pattern: '0 0 * * *',
+}, {
+	name: 'cleanCharts',
+	pattern: '0 0 * * *',
+}, {
+	name: 'aggregateRetention',
+	pattern: '0 0 * * *',
+}, {
+	name: 'clean',
+	pattern: '0 0 * * *',
+}, {
+	name: 'checkExpiredMutings',
+	pattern: '*/5 * * * *',
+}, {
+	name: 'bakeBufferedReactions',
+	pattern: '0 0 * * *',
+}, {
+	name: 'checkModeratorsActivity',
+	// 毎時30分に起動
+	pattern: '30 * * * *',
+}, {
+	name: 'cleanRemoteNotes',
+	// 毎日午前4時に起動(最も人の少ない時間帯)
+	pattern: '0 4 * * *',
+}];
+
@Injectable()
 export class QueueService {
 	constructor(
@@ -69,61 +100,30 @@ export class QueueService {
 		@Inject('queue:userWebhookDeliver') public userWebhookDeliverQueue: UserWebhookDeliverQueue,
 		@Inject('queue:systemWebhookDeliver') public systemWebhookDeliverQueue: SystemWebhookDeliverQueue,
 	) {
-		this.systemQueue.add('tickCharts', {
-		}, {
-			repeat: { pattern: '55 * * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
+		for (const def of REPEATABLE_SYSTEM_JOB_DEF) {
+			this.systemQueue.upsertJobScheduler(def.name, {
+				pattern: def.pattern,
+			}, {
+				name: def.name,
+				opts: {
+					// 期限ではなくcountで設定したいが、ジョブごとではなくキュー全体でカウントされるため、高頻度で実行されるジョブによって低頻度で実行されるジョブのログが消えることになる
+					removeOnComplete: {
+						age: 3600 * 24 * 7, // keep up to 7 days
+					},
+					removeOnFail: {
+						age: 3600 * 24 * 7, // keep up to 7 days
+					},
+				},
+			});
+		}

-		this.systemQueue.add('resyncCharts', {
-		}, {
-			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
-
-		this.systemQueue.add('cleanCharts', {
-		}, {
-			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
-
-		this.systemQueue.add('aggregateRetention', {
-		}, {
-			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
-
-		this.systemQueue.add('clean', {
-		}, {
-			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
-
-		this.systemQueue.add('checkExpiredMutings', {
-		}, {
-			repeat: { pattern: '*/5 * * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
-
-		this.systemQueue.add('bakeBufferedReactions', {
-		}, {
-			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
-		});
-
-		this.systemQueue.add('checkModeratorsActivity', {
-		}, {
-			// 毎時30分に起動
-			repeat: { pattern: '30 * * * *' },
-			removeOnComplete: 10,
-			removeOnFail: 30,
+		// 古いバージョンで作成され現在使われなくなったrepeatableジョブをクリーンアップ
+		this.systemQueue.getJobSchedulers().then(schedulers => {
+			for (const scheduler of schedulers) {
+				if (!REPEATABLE_SYSTEM_JOB_DEF.some(def => def.name === scheduler.key)) {
+					this.systemQueue.removeJobScheduler(scheduler.key);
+				}
+			}
 		});
 	}

@@ -810,6 +810,13 @@ export class QueueService {
 		}
 	}

+	@bindThis
+	public async queueGetJobLogs(queueType: typeof QUEUE_TYPES[number], jobId: string) {
+		const queue = this.getQueue(queueType);
+		const result = await queue.getJobLogs(jobId);
+		return result.logs;
+	}
+
 	@bindThis
 	public async queueGetJobs(queueType: typeof QUEUE_TYPES[number], jobTypes: JobType[], search?: string) {
 		const RETURN_LIMIT = 100;
@@ -66,6 +66,8 @@ export type RolePolicies = {
 	canImportUserLists: boolean;
 	chatAvailability: 'available' | 'readonly' | 'unavailable';
 	uploadableFileTypes: string[];
+	noteDraftLimit: number;
+	watermarkAvailable: boolean;
 };

 export const DEFAULT_POLICIES: RolePolicies = {
@@ -109,6 +111,8 @@ export const DEFAULT_POLICIES: RolePolicies = {
 		'video/*',
 		'audio/*',
 	],
+	noteDraftLimit: 10,
+	watermarkAvailable: true,
 };

@Injectable()
@@ -430,6 +434,8 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 				}
 				return [...set];
 			}),
+			noteDraftLimit: calc('noteDraftLimit', vs => Math.max(...vs)),
+			watermarkAvailable: calc('watermarkAvailable', vs => vs.some(v => v === true)),
 		};
 	}

@@ -227,9 +227,9 @@ export class SearchService {

 		if (opts.host) {
 			if (opts.host === '.') {
-				query.andWhere('user.host IS NULL');
+				query.andWhere('note.userHost IS NULL');
 			} else {
-				query.andWhere('user.host = :host', { host: opts.host });
+				query.andWhere('note.userHost = :host', { host: opts.host });
 			}
 		}

@@ -93,6 +93,11 @@ export class SignupService {
 			if (isPreserved) {
 				throw new Error('USED_USERNAME');
 			}
+
+			const hasProhibitedWords = this.utilityService.isKeyWordIncluded(username.toLowerCase(), this.meta.prohibitedWordsForNameOfUser);
+			if (hasProhibitedWords) {
+				throw new Error('USED_USERNAME');
+			}
 		}

 		const keyPair = await new Promise<string[]>((res, rej) =>
@@ -0,0 +1,189 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { EntityNotFoundError } from 'typeorm';
+import { DI } from '@/di-symbols.js';
+import type { Packed } from '@/misc/json-schema.js';
+import { awaitAll } from '@/misc/prelude/await-all.js';
+import type { MiUser, MiNote, MiNoteDraft } from '@/models/_.js';
+import type { NoteDraftsRepository, ChannelsRepository } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { DebounceLoader } from '@/misc/loader.js';
+import { IdService } from '@/core/IdService.js';
+import type { OnModuleInit } from '@nestjs/common';
+import type { UserEntityService } from './UserEntityService.js';
+import type { DriveFileEntityService } from './DriveFileEntityService.js';
+import type { NoteEntityService } from './NoteEntityService.js';
+
+@Injectable()
+export class NoteDraftEntityService implements OnModuleInit {
+	private userEntityService: UserEntityService;
+	private driveFileEntityService: DriveFileEntityService;
+	private idService: IdService;
+	private noteEntityService: NoteEntityService;
+	private noteDraftLoader = new DebounceLoader(this.findNoteDraftOrFail);
+
+	constructor(
+		private moduleRef: ModuleRef,
+
+		@Inject(DI.noteDraftsRepository)
+		private noteDraftsRepository: NoteDraftsRepository,
+
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
+	) {
+	}
+
+	onModuleInit() {
+		this.userEntityService = this.moduleRef.get('UserEntityService');
+		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
+		this.idService = this.moduleRef.get('IdService');
+		this.noteEntityService = this.moduleRef.get('NoteEntityService');
+	}
+
+	@bindThis
+	public async packAttachedFiles(fileIds: MiNote['fileIds'], packedFiles: Map<MiNote['fileIds'][number], Packed<'DriveFile'> | null>): Promise<Packed<'DriveFile'>[]> {
+		const missingIds = [];
+		for (const id of fileIds) {
+			if (!packedFiles.has(id)) missingIds.push(id);
+		}
+		if (missingIds.length) {
+			const additionalMap = await this.driveFileEntityService.packManyByIdsMap(missingIds);
+			for (const [k, v] of additionalMap) {
+				packedFiles.set(k, v);
+			}
+		}
+		return fileIds.map(id => packedFiles.get(id)).filter(x => x != null);
+	}
+
+	@bindThis
+	public async pack(
+		src: MiNoteDraft['id'] | MiNoteDraft,
+		me?: { id: MiUser['id'] } | null | undefined,
+		options?: {
+			detail?: boolean;
+			skipHide?: boolean;
+			withReactionAndUserPairCache?: boolean;
+			_hint_?: {
+				packedFiles: Map<MiNote['fileIds'][number], Packed<'DriveFile'> | null>;
+				packedUsers: Map<MiUser['id'], Packed<'UserLite'>>
+			};
+		},
+	): Promise<Packed<'NoteDraft'>> {
+		const opts = Object.assign({
+			detail: true,
+		}, options);
+
+		const noteDraft = typeof src === 'object' ? src : await this.noteDraftLoader.load(src);
+
+		const text = noteDraft.text;
+
+		const channel = noteDraft.channelId
+			? noteDraft.channel
+				? noteDraft.channel
+				: await this.channelsRepository.findOneBy({ id: noteDraft.channelId })
+			: null;
+
+		const packedFiles = options?._hint_?.packedFiles;
+		const packedUsers = options?._hint_?.packedUsers;
+
+		async function nullIfEntityNotFound<T>(promise: Promise<T>): Promise<T | null> {
+			try {
+				return await promise;
+			} catch (err) {
+				if (err instanceof EntityNotFoundError) {
+					return null;
+				}
+				throw err;
+			}
+		}
+
+		const packed: Packed<'NoteDraft'> = await awaitAll({
+			id: noteDraft.id,
+			createdAt: this.idService.parse(noteDraft.id).date.toISOString(),
+			userId: noteDraft.userId,
+			user: packedUsers?.get(noteDraft.userId) ?? this.userEntityService.pack(noteDraft.user ?? noteDraft.userId, me),
+			text: text,
+			cw: noteDraft.cw,
+			visibility: noteDraft.visibility,
+			localOnly: noteDraft.localOnly,
+			reactionAcceptance: noteDraft.reactionAcceptance,
+			visibleUserIds: noteDraft.visibility === 'specified' ? noteDraft.visibleUserIds : undefined,
+			hashtag: noteDraft.hashtag ?? undefined,
+			fileIds: noteDraft.fileIds,
+			files: packedFiles != null ? this.packAttachedFiles(noteDraft.fileIds, packedFiles) : this.driveFileEntityService.packManyByIds(noteDraft.fileIds),
+			replyId: noteDraft.replyId,
+			renoteId: noteDraft.renoteId,
+			channelId: noteDraft.channelId ?? undefined,
+			channel: channel ? {
+				id: channel.id,
+				name: channel.name,
+				color: channel.color,
+				isSensitive: channel.isSensitive,
+				allowRenoteToExternal: channel.allowRenoteToExternal,
+				userId: channel.userId,
+			} : undefined,
+
+			...(opts.detail ? {
+				reply: noteDraft.replyId ? nullIfEntityNotFound(this.noteEntityService.pack(noteDraft.replyId, me, {
+					detail: false,
+					skipHide: opts.skipHide,
+				})) : undefined,
+
+				renote: noteDraft.renoteId ? nullIfEntityNotFound(this.noteEntityService.pack(noteDraft.renoteId, me, {
+					detail: true,
+					skipHide: opts.skipHide,
+				})) : undefined,
+
+				poll: noteDraft.hasPoll ? {
+					choices: noteDraft.pollChoices,
+					multiple: noteDraft.pollMultiple,
+					expiresAt: noteDraft.pollExpiresAt?.toISOString(),
+					expiredAfter: noteDraft.pollExpiredAfter,
+				} : undefined,
+			} : {} ),
+		});
+
+		return packed;
+	}
+
+	@bindThis
+	public async packMany(
+		noteDrafts: MiNoteDraft[],
+		me?: { id: MiUser['id'] } | null | undefined,
+		options?: {
+			detail?: boolean;
+		},
+	) {
+		if (noteDrafts.length === 0) return [];
+
+		// TODO: 本当は renote とか reply がないのに renoteId とか replyId があったらここで解決しておく
+		const fileIds = noteDrafts.map(n => [n.fileIds, n.renote?.fileIds, n.reply?.fileIds]).flat(2).filter(x => x != null);
+		const packedFiles = fileIds.length > 0 ? await this.driveFileEntityService.packManyByIdsMap(fileIds) : new Map();
+		const users = [
+			...noteDrafts.map(({ user, userId }) => user ?? userId),
+		];
+		const packedUsers = await this.userEntityService.packMany(users, me)
+			.then(users => new Map(users.map(u => [u.id, u])));
+
+		return await Promise.all(noteDrafts.map(n => this.pack(n, me, {
+			...options,
+			_hint_: {
+				packedFiles,
+				packedUsers,
+			},
+		})));
+	}
+
+	@bindThis
+	private findNoteDraftOrFail(id: string): Promise<MiNoteDraft> {
+		return this.noteDraftsRepository.findOneOrFail({
+			where: { id },
+			relations: ['user'],
+		});
+	}
+}
@@ -4,7 +4,7 @@
 */

 import { Inject, Injectable } from '@nestjs/common';
-import { In } from 'typeorm';
+import { EntityNotFoundError, In } from 'typeorm';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { Packed } from '@/misc/json-schema.js';
@@ -46,6 +46,17 @@ function getAppearNoteIds(notes: MiNote[]): Set<string> {
 	return appearNoteIds;
 }

+async function nullIfEntityNotFound<T>(promise: Promise<T>): Promise<T | null> {
+	try {
+		return await promise;
+	} catch (err) {
+		if (err instanceof EntityNotFoundError) {
+			return null;
+		}
+		throw err;
+	}
+}
+
@Injectable()
 export class NoteEntityService implements OnModuleInit {
 	private userEntityService: UserEntityService;
@@ -436,19 +447,21 @@ export class NoteEntityService implements OnModuleInit {
 			...(opts.detail ? {
 				clippedCount: note.clippedCount,

-				reply: note.replyId ? this.pack(note.reply ?? note.replyId, me, {
+				// そもそもJOINしていない場合はundefined、JOINしたけど存在していなかった場合はnullで区別される
+				reply: (note.replyId && note.reply === null) ? null : note.replyId ? nullIfEntityNotFound(this.pack(note.reply ?? note.replyId, me, {
 					detail: false,
 					skipHide: opts.skipHide,
 					withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
 					_hint_: options?._hint_,
-				}) : undefined,
+				})) : undefined,

-				renote: note.renoteId ? this.pack(note.renote ?? note.renoteId, me, {
+				// そもそもJOINしていない場合はundefined、JOINしたけど存在していなかった場合はnullで区別される
+				renote: (note.renoteId && note.renote === null) ? null : note.renoteId ? nullIfEntityNotFound(this.pack(note.renote ?? note.renoteId, me, {
 					detail: true,
 					skipHide: opts.skipHide,
 					withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
 					_hint_: options?._hint_,
-				}) : undefined,
+				})) : undefined,

 				poll: note.hasPoll ? this.populatePoll(note, meId) : undefined,

@@ -591,7 +604,7 @@ export class NoteEntityService implements OnModuleInit {
 	private findNoteOrFail(id: string): Promise<MiNote> {
 		return this.notesRepository.findOneOrFail({
 			where: { id },
-			relations: ['user'],
+			relations: ['user', 'renote', 'reply'],
 		});
 	}

@@ -89,5 +89,6 @@ export const DI = {
 	chatRoomInvitationsRepository: Symbol('chatRoomInvitationsRepository'),
 	bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
 	reversiGamesRepository: Symbol('reversiGamesRepository'),
+	noteDraftsRepository: Symbol('noteDraftsRepository'),
 	//#endregion
 };
@@ -72,6 +72,7 @@ import { packedChatRoomSchema } from '@/models/json-schema/chat-room.js';
 import { packedChatRoomInvitationSchema } from '@/models/json-schema/chat-room-invitation.js';
 import { packedChatRoomMembershipSchema } from '@/models/json-schema/chat-room-membership.js';
 import { packedAchievementNameSchema, packedAchievementSchema } from '@/models/json-schema/achievement.js';
+import { packedNoteDraftSchema } from '@/models/json-schema/note-draft.js';

 export const refs = {
 	UserLite: packedUserLiteSchema,
@@ -89,6 +90,7 @@ export const refs = {
 	Announcement: packedAnnouncementSchema,
 	App: packedAppSchema,
 	Note: packedNoteSchema,
+	NoteDraft: packedNoteDraftSchema,
 	NoteReaction: packedNoteReactionSchema,
 	NoteFavorite: packedNoteFavoriteSchema,
 	Notification: packedNotificationSchema,
@@ -22,7 +22,7 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 有効かどうか.
 	 */
-	@Index()
+	@Index('IDX_abuse_report_notification_recipient_isActive')
 	@Column('boolean', {
 		default: true,
 	})
@@ -47,7 +47,7 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 通知方法.
 	 */
-	@Index()
+	@Index('IDX_abuse_report_notification_recipient_method')
 	@Column('varchar', {
 		length: 64,
 	})
@@ -56,10 +56,11 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 通知先のユーザID.
 	 */
-	@Index()
+	@Index('IDX_abuse_report_notification_recipient_userId')
 	@Column({
 		...id(),
 		nullable: true,
+		default: null,
 	})
 	public userId: MiUser['id'] | null;

@@ -75,17 +76,20 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 通知先のユーザプロフィール.
 	 */
-	@ManyToOne(type => MiUserProfile, {})
+	@ManyToOne(type => MiUserProfile, {
+		onDelete: 'CASCADE',
+	})
 	@JoinColumn({ name: 'userId', referencedColumnName: 'userId', foreignKeyConstraintName: 'FK_abuse_report_notification_recipient_userId2' })
 	public userProfile: MiUserProfile | null;

 	/**
 	 * 通知先のシステムWebhookId.
 	 */
-	@Index()
+	@Index('IDX_abuse_report_notification_recipient_systemWebhookId')
 	@Column({
 		...id(),
 		nullable: true,
+		default: null,
 	})
 	public systemWebhookId: string | null;

@@ -95,6 +99,6 @@ export class MiAbuseReportNotificationRecipient {
 	@ManyToOne(type => MiSystemWebhook, {
 		onDelete: 'CASCADE',
 	})
-	@JoinColumn()
+	@JoinColumn({ name: 'systemWebhookId', referencedColumnName: 'id', foreignKeyConstraintName: 'FK_abuse_report_notification_recipient_systemWebhookId' })
 	public systemWebhook: MiSystemWebhook | null;
 }
@@ -8,6 +8,7 @@ import { id } from './util/id.js';

@Entity('emoji')
@Index(['name', 'host'], { unique: true })
+@Index('IDX_EMOJI_ROLE_IDS', { synchronize: false }) // GIN for roleIdsThatCanBeUsedThisEmojiAsReaction in production
 export class MiEmoji {
 	@PrimaryColumn(id())
 	public id: string;
@@ -32,6 +33,7 @@ export class MiEmoji {
 	@Column('varchar', {
 		length: 128, nullable: true,
 	})
+	@Index('IDX_EMOJI_CATEGORY')
 	public category: string | null;

 	@Column('varchar', {
@@ -59,7 +59,7 @@ export class MiMeta {
 	public maintainerEmail: string | null;

 	@Column('boolean', {
-		default: false,
+		default: true,
 	})
 	public disableRegistration: boolean;

@@ -570,7 +570,7 @@ export class MiMeta {
 	public bannedEmailDomains: string[];

 	@Column('varchar', {
-		length: 1024, array: true, 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" }',
+		length: 1024, array: true, 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'],
 	})
 	public preservedUsernames: string[];

@@ -635,7 +635,7 @@ export class MiMeta {
 	public urlPreviewMaximumContentLength: number;

 	@Column('boolean', {
-		default: true,
+		default: false,
 	})
 	public urlPreviewRequireContentLength: boolean;

@@ -648,12 +648,13 @@ export class MiMeta {
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
+		default: null,
 	})
 	public urlPreviewUserAgent: string | null;

 	@Column('varchar', {
 		length: 128,
-		default: 'all',
+		default: 'none',
 	})
 	public federation: 'all' | 'specified' | 'none';

@@ -700,6 +701,21 @@ export class MiMeta {
 		default: true,
 	})
 	public allowExternalApRedirect: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public enableRemoteNotesCleaning: boolean;
+
+	@Column('integer', {
+		default: 60, // minutes
+	})
+	public remoteNotesCleaningMaxProcessingDurationInMinutes: number;
+
+	@Column('integer', {
+		default: 90, // days
+	})
+	public remoteNotesCleaningExpiryDaysForEachNotes: number;
 }

 export type SoftwareSuspension = {
@@ -4,7 +4,7 @@
 */

 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { noteVisibilities } from '@/types.js';
+import { noteVisibilities, noteReactionAcceptances } from '@/types.js';
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
 import { MiChannel } from './Channel.js';
@@ -20,7 +20,8 @@ import type { MiDriveFile } from './DriveFile.js';
 // You should not use `@Index({ concurrent: true })` decorator because database initialization for test will fail
 // because it will always run CREATE INDEX in transaction based on decorators.
 // Not appending `{ concurrent: true }` to `@Index` will not cause any problem in production,
-@Index(['userId', 'id'])
+
+@Index(['userId', 'id']) // Note: this index is ("userId", "id" DESC) in production, but not in test.
@Entity('note')
 export class MiNote {
 	@PrimaryColumn(id())
@@ -35,7 +36,7 @@ export class MiNote {
 	public replyId: MiNote['id'] | null;

 	@ManyToOne(type => MiNote, {
-		onDelete: 'CASCADE',
+		createForeignKeyConstraints: false,
 	})
 	@JoinColumn()
 	public reply: MiNote | null;
@@ -49,7 +50,7 @@ export class MiNote {
 	public renoteId: MiNote['id'] | null;

 	@ManyToOne(type => MiNote, {
-		onDelete: 'CASCADE',
+		createForeignKeyConstraints: false,
 	})
 	@JoinColumn()
 	public renote: MiNote | null;
@@ -96,7 +97,7 @@ export class MiNote {
 	@Column('varchar', {
 		length: 64, nullable: true,
 	})
-	public reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null;
+	public reactionAcceptance: typeof noteReactionAcceptances[number];

 	@Column('smallint', {
 		default: 0,
@@ -0,0 +1,163 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
+import { noteVisibilities, noteReactionAcceptances } from '@/types.js';
+import { id } from './util/id.js';
+import { MiUser } from './User.js';
+import { MiChannel } from './Channel.js';
+import { MiNote } from './Note.js';
+import type { MiDriveFile } from './DriveFile.js';
+
+@Entity('note_draft')
+@Index('IDX_NOTE_DRAFT_FILE_IDS', { synchronize: false }) // GIN for fileIds in production
+@Index('IDX_NOTE_DRAFT_VISIBLE_USER_IDS', { synchronize: false }) // GIN for visibleUserIds in production
+export class MiNoteDraft {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index('IDX_NOTE_DRAFT_REPLY_ID')
+	@Column({
+		...id(),
+		nullable: true,
+		comment: 'The ID of reply target.',
+	})
+	public replyId: MiNote['id'] | null;
+
+	// There is a possibility that replyId is not null but reply is null when the reply note is deleted.
+	@ManyToOne(type => MiNote, {
+		createForeignKeyConstraints: false,
+	})
+	@JoinColumn()
+	public reply: MiNote | null;
+
+	@Index('IDX_NOTE_DRAFT_RENOTE_ID')
+	@Column({
+		...id(),
+		nullable: true,
+		comment: 'The ID of renote target.',
+	})
+	public renoteId: MiNote['id'] | null;
+
+	// There is a possibility that renoteId is not null but renote is null when the renote note is deleted.
+	@ManyToOne(type => MiNote, {
+		createForeignKeyConstraints: false,
+	})
+	@JoinColumn()
+	public renote: MiNote | null;
+
+	// TODO: varcharにしたい(Note.tsと同じ)
+	@Column('text', {
+		nullable: true,
+	})
+	public text: string | null;
+
+	@Column('varchar', {
+		length: 512, nullable: true,
+	})
+	public cw: string | null;
+
+	@Index('IDX_NOTE_DRAFT_USER_ID')
+	@Column({
+		...id(),
+		comment: 'The ID of author.',
+	})
+	public userId: MiUser['id'];
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user: MiUser | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public localOnly: boolean;
+
+	@Column('varchar', {
+		length: 64, nullable: true,
+	})
+	public reactionAcceptance: typeof noteReactionAcceptances[number];
+
+	/**
+	 * public ... 公開
+	 * home ... ホームタイムライン(ユーザーページのタイムライン含む)のみに流す
+	 * followers ... フォロワーのみ
+	 * specified ... visibleUserIds で指定したユーザーのみ
+	 */
+	@Column('enum', { enum: noteVisibilities })
+	public visibility: typeof noteVisibilities[number];
+
+	@Index('IDX_NOTE_DRAFT_FILE_IDS', { synchronize: false })
+	@Column({
+		...id(),
+		array: true, default: '{}',
+	})
+	public fileIds: MiDriveFile['id'][];
+
+	@Index('IDX_NOTE_DRAFT_VISIBLE_USER_IDS', { synchronize: false })
+	@Column({
+		...id(),
+		array: true, default: '{}',
+	})
+	public visibleUserIds: MiUser['id'][];
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+	})
+	public hashtag: string | null;
+
+	@Index('IDX_NOTE_DRAFT_CHANNEL_ID')
+	@Column({
+		...id(),
+		nullable: true,
+		comment: 'The ID of source channel.',
+	})
+	public channelId: MiChannel['id'] | null;
+
+	// There is a possibility that channelId is not null but channel is null when the channel is deleted.
+	// (deleting channel is not implemented so it's not happening now but may happen in the future)
+	@ManyToOne(type => MiChannel, {
+		createForeignKeyConstraints: false,
+	})
+	@JoinColumn()
+	public channel: MiChannel | null;
+
+	// 以下、Pollについて追加
+
+	@Column('boolean', {
+		default: false,
+	})
+	public hasPoll: boolean;
+
+	@Column('varchar', {
+		length: 256, array: true, default: '{}',
+	})
+	public pollChoices: string[];
+
+	@Column('boolean')
+	public pollMultiple: boolean;
+
+	@Column('timestamp with time zone', {
+		nullable: true,
+	})
+	public pollExpiresAt: Date | null;
+
+	@Column('bigint', {
+		nullable: true,
+	})
+	public pollExpiredAfter: number | null;
+
+	// ここまで追加
+
+	constructor(data: Partial<MiNoteDraft>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
+}
@@ -42,6 +42,7 @@ import {
 	MiNoteFavorite,
 	MiNoteReaction,
 	MiNoteThreadMuting,
+	MiNoteDraft,
 	MiPage,
 	MiPageLike,
 	MiPasswordResetRequest,
@@ -140,6 +141,12 @@ const $noteReactionsRepository: Provider = {
 	inject: [DI.db],
 };

+const $noteDraftsRepository: Provider = {
+	provide: DI.noteDraftsRepository,
+	useFactory: (db: DataSource) => db.getRepository(MiNoteDraft).extend(miRepository as MiRepository<MiNoteDraft>),
+	inject: [DI.db],
+};
+
 const $pollsRepository: Provider = {
 	provide: DI.pollsRepository,
 	useFactory: (db: DataSource) => db.getRepository(MiPoll).extend(miRepository as MiRepository<MiPoll>),
@@ -542,6 +549,7 @@ const $reversiGamesRepository: Provider = {
 		$noteFavoritesRepository,
 		$noteThreadMutingsRepository,
 		$noteReactionsRepository,
+		$noteDraftsRepository,
 		$pollsRepository,
 		$pollVotesRepository,
 		$userProfilesRepository,
@@ -618,6 +626,7 @@ const $reversiGamesRepository: Provider = {
 		$noteFavoritesRepository,
 		$noteThreadMutingsRepository,
 		$noteReactionsRepository,
+		$noteDraftsRepository,
 		$pollsRepository,
 		$pollVotesRepository,
 		$userProfilesRepository,
@@ -120,7 +120,7 @@ export class MiUser {

 	// avatarId が null になったとしてもこれが null でない可能性があるため、このフィールドを使うときは avatarId の non-null チェックをすること
 	@Column('varchar', {
-		length: 512, nullable: true,
+		length: 1024, nullable: true,
 	})
 	public avatarUrl: string | null;

@@ -29,7 +29,7 @@ export class MiUserProfile {
 	})
 	public location: string | null;

-	@Index()
+	// Note: There's index named IDX_de22cd2b445eee31ae51cdbe99 for SUBSTR("birthday", 6, 5)
 	@Column('char', {
 		length: 10, nullable: true,
 		comment: 'The birthday (YYYY-MM-DD) of the User.',
@@ -55,6 +55,7 @@ import { MiMeta } from '@/models/Meta.js';
 import { MiModerationLog } from '@/models/ModerationLog.js';
 import { MiMuting } from '@/models/Muting.js';
 import { MiNote } from '@/models/Note.js';
+import { MiNoteDraft } from '@/models/NoteDraft.js';
 import { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
 import { MiNoteThreadMuting } from '@/models/NoteThreadMuting.js';
@@ -188,6 +189,7 @@ export {
 	MiMuting,
 	MiRenoteMuting,
 	MiNote,
+	MiNoteDraft,
 	MiNoteFavorite,
 	MiNoteReaction,
 	MiNoteThreadMuting,
@@ -266,6 +268,7 @@ export type ModerationLogsRepository = Repository<MiModerationLog> & MiRepositor
 export type MutingsRepository = Repository<MiMuting> & MiRepository<MiMuting>;
 export type RenoteMutingsRepository = Repository<MiRenoteMuting> & MiRepository<MiRenoteMuting>;
 export type NotesRepository = Repository<MiNote> & MiRepository<MiNote>;
+export type NoteDraftsRepository = Repository<MiNoteDraft> & MiRepository<MiNoteDraft>;
 export type NoteFavoritesRepository = Repository<MiNoteFavorite> & MiRepository<MiNoteFavorite>;
 export type NoteReactionsRepository = Repository<MiNoteReaction> & MiRepository<MiNoteReaction>;
 export type NoteThreadMutingsRepository = Repository<MiNoteThreadMuting> & MiRepository<MiNoteThreadMuting>;
@@ -51,7 +51,7 @@ export const packedFlashSchema = {
 		},
 		likedCount: {
 			type: 'number',
-			optional: false, nullable: true,
+			optional: false, nullable: false,
 		},
 		isLiked: {
 			type: 'boolean',
@@ -0,0 +1,171 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export const packedNoteDraftSchema = {
+	type: 'object',
+	properties: {
+		id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'date-time',
+		},
+		text: {
+			type: 'string',
+			optional: false, nullable: true,
+		},
+		cw: {
+			type: 'string',
+			optional: true, nullable: true,
+		},
+		userId: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		user: {
+			type: 'object',
+			ref: 'UserLite',
+			optional: false, nullable: false,
+		},
+		replyId: {
+			type: 'string',
+			optional: true, nullable: true,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		renoteId: {
+			type: 'string',
+			optional: true, nullable: true,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		reply: {
+			type: 'object',
+			optional: true, nullable: true,
+			ref: 'Note',
+			description: 'The reply target note contents if exists. If the reply target has been deleted since the draft was created, this will be null while replyId is not null.',
+		},
+		renote: {
+			type: 'object',
+			optional: true, nullable: true,
+			ref: 'Note',
+			description: 'The renote target note contents if exists. If the renote target has been deleted since the draft was created, this will be null while renoteId is not null.',
+		},
+		visibility: {
+			type: 'string',
+			optional: false, nullable: false,
+			enum: ['public', 'home', 'followers', 'specified'],
+		},
+		visibleUserIds: {
+			type: 'array',
+			optional: true, nullable: false,
+			items: {
+				type: 'string',
+				optional: false, nullable: false,
+				format: 'id',
+			},
+		},
+		fileIds: {
+			type: 'array',
+			optional: true, nullable: false,
+			items: {
+				type: 'string',
+				optional: false, nullable: false,
+				format: 'id',
+			},
+		},
+		files: {
+			type: 'array',
+			optional: true, nullable: false,
+			items: {
+				type: 'object',
+				optional: false, nullable: false,
+				ref: 'DriveFile',
+			},
+		},
+		hashtag: {
+			type: 'string',
+			optional: true, nullable: false,
+		},
+		poll: {
+			type: 'object',
+			optional: true, nullable: true,
+			properties: {
+				expiresAt: {
+					type: 'string',
+					optional: true, nullable: true,
+					format: 'date-time',
+				},
+				expiredAfter: {
+					type: 'number',
+					optional: true, nullable: true,
+				},
+				multiple: {
+					type: 'boolean',
+					optional: false, nullable: false,
+				},
+				choices: {
+					type: 'array',
+					optional: false, nullable: false,
+					items: {
+						type: 'string',
+						optional: false, nullable: false,
+					},
+				},
+			},
+		},
+		channelId: {
+			type: 'string',
+			optional: true, nullable: true,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		channel: {
+			type: 'object',
+			optional: true, nullable: true,
+			properties: {
+				id: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+				name: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+				color: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+				isSensitive: {
+					type: 'boolean',
+					optional: false, nullable: false,
+				},
+				allowRenoteToExternal: {
+					type: 'boolean',
+					optional: false, nullable: false,
+				},
+				userId: {
+					type: 'string',
+					optional: false, nullable: true,
+				},
+			},
+		},
+		localOnly: {
+			type: 'boolean',
+			optional: true, nullable: false,
+		},
+		reactionAcceptance: {
+			type: 'string',
+			optional: false, nullable: true,
+			enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote', null],
+		},
+	},
+} as const;
@@ -309,6 +309,14 @@ export const packedRolePoliciesSchema = {
 			optional: false, nullable: false,
 			enum: ['available', 'readonly', 'unavailable'],
 		},
+		noteDraftLimit: {
+			type: 'integer',
+			optional: false, nullable: false,
+		},
+		watermarkAvailable: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 	},
 } as const;

@@ -45,6 +45,7 @@ import { MiNote } from '@/models/Note.js';
 import { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
 import { MiNoteThreadMuting } from '@/models/NoteThreadMuting.js';
+import { MiNoteDraft } from '@/models/NoteDraft.js';
 import { MiPage } from '@/models/Page.js';
 import { MiPageLike } from '@/models/PageLike.js';
 import { MiPasswordResetRequest } from '@/models/PasswordResetRequest.js';
@@ -210,6 +211,7 @@ export const entities = [
 	MiNoteFavorite,
 	MiNoteReaction,
 	MiNoteThreadMuting,
+	MiNoteDraft,
 	MiPage,
 	MiPageLike,
 	MiGalleryPost,
@@ -6,7 +6,6 @@
 import { Module } from '@nestjs/common';
 import { CoreModule } from '@/core/CoreModule.js';
 import { GlobalModule } from '@/GlobalModule.js';
-import { CheckModeratorsActivityProcessorService } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 import { QueueLoggerService } from './QueueLoggerService.js';
 import { QueueProcessorService } from './QueueProcessorService.js';
 import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
@@ -18,6 +17,8 @@ import { CheckExpiredMutingsProcessorService } from './processors/CheckExpiredMu
 import { BakeBufferedReactionsProcessorService } from './processors/BakeBufferedReactionsProcessorService.js';
 import { CleanChartsProcessorService } from './processors/CleanChartsProcessorService.js';
 import { CleanProcessorService } from './processors/CleanProcessorService.js';
+import { CheckModeratorsActivityProcessorService } from './processors/CheckModeratorsActivityProcessorService.js';
+import { CleanRemoteNotesProcessorService } from './processors/CleanRemoteNotesProcessorService.js';
 import { CleanRemoteFilesProcessorService } from './processors/CleanRemoteFilesProcessorService.js';
 import { DeleteAccountProcessorService } from './processors/DeleteAccountProcessorService.js';
 import { DeleteDriveFilesProcessorService } from './processors/DeleteDriveFilesProcessorService.js';
@@ -83,6 +84,7 @@ import { RelationshipProcessorService } from './processors/RelationshipProcessor
 		AggregateRetentionProcessorService,
 		CheckExpiredMutingsProcessorService,
 		CheckModeratorsActivityProcessorService,
+		CleanRemoteNotesProcessorService,
 		QueueProcessorService,
 	],
 	exports: [
@@ -43,6 +43,7 @@ import { CheckExpiredMutingsProcessorService } from './processors/CheckExpiredMu
 import { BakeBufferedReactionsProcessorService } from './processors/BakeBufferedReactionsProcessorService.js';
 import { CleanProcessorService } from './processors/CleanProcessorService.js';
 import { AggregateRetentionProcessorService } from './processors/AggregateRetentionProcessorService.js';
+import { CleanRemoteNotesProcessorService } from './processors/CleanRemoteNotesProcessorService.js';
 import { QueueLoggerService } from './QueueLoggerService.js';
 import { QUEUE, baseWorkerOptions } from './const.js';

@@ -123,6 +124,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		private bakeBufferedReactionsProcessorService: BakeBufferedReactionsProcessorService,
 		private checkModeratorsActivityProcessorService: CheckModeratorsActivityProcessorService,
 		private cleanProcessorService: CleanProcessorService,
+		private cleanRemoteNotesProcessorService: CleanRemoteNotesProcessorService,
 	) {
 		this.logger = this.queueLoggerService.logger;

@@ -164,6 +166,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					case 'bakeBufferedReactions': return this.bakeBufferedReactionsProcessorService.process();
 					case 'checkModeratorsActivity': return this.checkModeratorsActivityProcessorService.process();
 					case 'clean': return this.cleanProcessorService.process();
+					case 'cleanRemoteNotes': return this.cleanRemoteNotesProcessorService.process(job);
 					default: throw new Error(`unrecognized job type ${job.name} for system`);
 				}
 			};
@@ -34,6 +34,11 @@ export class CleanRemoteFilesProcessorService {
 		let deletedCount = 0;
 		let cursor: MiDriveFile['id'] | null = null;

+		const total = await this.driveFilesRepository.countBy({
+			userHost: Not(IsNull()),
+			isLink: false,
+		});
+
 		while (true) {
 			const files = await this.driveFilesRepository.find({
 				where: {
@@ -58,12 +63,7 @@ export class CleanRemoteFilesProcessorService {

 			deletedCount += 8;

-			const total = await this.driveFilesRepository.countBy({
-				userHost: Not(IsNull()),
-				isLink: false,
-			});
-
-			job.updateProgress(100 / total * deletedCount);
+			job.updateProgress(deletedCount * total / 100);
 		}

 		this.logger.succ('All cached remote files has been deleted.');
@@ -0,0 +1,174 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { setTimeout } from 'node:timers/promises';
+import { Inject, Injectable } from '@nestjs/common';
+import { And, In, IsNull, LessThan, MoreThan, Not } from 'typeorm';
+import { DI } from '@/di-symbols.js';
+import type { MiMeta, MiNote, NoteFavoritesRepository, NotesRepository, UserNotePiningsRepository } from '@/models/_.js';
+import type Logger from '@/logger.js';
+import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
+import { QueueLoggerService } from '../QueueLoggerService.js';
+import type * as Bull from 'bullmq';
+
+@Injectable()
+export class CleanRemoteNotesProcessorService {
+	private logger: Logger;
+
+	constructor(
+		@Inject(DI.meta)
+		private meta: MiMeta,
+
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
+		@Inject(DI.noteFavoritesRepository)
+		private noteFavoritesRepository: NoteFavoritesRepository,
+
+		@Inject(DI.userNotePiningsRepository)
+		private userNotePiningsRepository: UserNotePiningsRepository,
+
+		private idService: IdService,
+		private queueLoggerService: QueueLoggerService,
+	) {
+		this.logger = this.queueLoggerService.logger.createSubLogger('clean-remote-notes');
+	}
+
+	@bindThis
+	public async process(job: Bull.Job<Record<string, unknown>>): Promise<{
+		deletedCount: number;
+		oldest: number | null;
+		newest: number | null;
+		skipped?: boolean;
+	}> {
+		if (!this.meta.enableRemoteNotesCleaning) {
+			this.logger.info('Remote notes cleaning is disabled, skipping...');
+			return {
+				deletedCount: 0,
+				oldest: null,
+				newest: null,
+				skipped: true,
+			};
+		}
+
+		this.logger.info('cleaning remote notes...');
+
+		const maxDuration = this.meta.remoteNotesCleaningMaxProcessingDurationInMinutes * 60 * 1000; // Convert minutes to milliseconds
+		const startAt = Date.now();
+
+		const MAX_NOTE_COUNT_PER_QUERY = 50;
+
+		const stats = {
+			deletedCount: 0,
+			oldest: null as number | null,
+			newest: null as number | null,
+		};
+
+		let cursor: MiNote['id'] = this.idService.gen(Date.now() - (1000 * 60 * 60 * 24 * this.meta.remoteNotesCleaningExpiryDaysForEachNotes));
+
+		while (true) {
+			const batchBeginAt = Date.now();
+
+			let notes: Pick<MiNote, 'id'>[] = await this.notesRepository.find({
+				where: {
+					id: LessThan(cursor),
+					userHost: Not(IsNull()),
+					clippedCount: 0,
+					renoteCount: 0,
+				},
+				take: MAX_NOTE_COUNT_PER_QUERY,
+				order: {
+					// 新しい順
+					// https://github.com/misskey-dev/misskey/pull/16292#issuecomment-3139376314
+					id: -1,
+				},
+				select: ['id'],
+			});
+
+			const fetchedCount = notes.length;
+
+			for (const note of notes) {
+				if (note.id < cursor) {
+					cursor = note.id;
+				}
+			}
+
+			const pinings = notes.length === 0 ? [] : await this.userNotePiningsRepository.find({
+				where: {
+					noteId: In(notes.map(note => note.id)),
+				},
+				select: ['noteId'],
+			});
+
+			notes = notes.filter(note => {
+				return !pinings.some(pining => pining.noteId === note.id);
+			});
+
+			const favorites = notes.length === 0 ? [] : await this.noteFavoritesRepository.find({
+				where: {
+					noteId: In(notes.map(note => note.id)),
+				},
+				select: ['noteId'],
+			});
+
+			notes = notes.filter(note => {
+				return !favorites.some(favorite => favorite.noteId === note.id);
+			});
+
+			const replies = notes.length === 0 ? [] : await this.notesRepository.find({
+				where: {
+					replyId: In(notes.map(note => note.id)),
+					userHost: IsNull(),
+				},
+				select: ['replyId'],
+			});
+
+			notes = notes.filter(note => {
+				return !replies.some(reply => reply.replyId === note.id);
+			});
+
+			if (notes.length > 0) {
+				await this.notesRepository.delete(notes.map(note => note.id));
+
+				for (const note of notes) {
+					const t = this.idService.parse(note.id).date.getTime();
+					if (stats.oldest === null || t < stats.oldest) {
+						stats.oldest = t;
+					}
+					if (stats.newest === null || t > stats.newest) {
+						stats.newest = t;
+					}
+				}
+
+				stats.deletedCount += notes.length;
+			}
+
+			job.log(`Deleted ${notes.length} of ${fetchedCount}; ${Date.now() - batchBeginAt}ms`);
+
+			const elapsed = Date.now() - startAt;
+
+			if (elapsed >= maxDuration) {
+				this.logger.info(`Reached maximum duration of ${maxDuration}ms, stopping...`);
+				job.log('Reached maximum duration, stopping cleaning.');
+				job.updateProgress(100);
+				break;
+			}
+
+			job.updateProgress((elapsed / maxDuration) * 100);
+
+			await setTimeout(1000 * 5); // Wait a moment to avoid overwhelming the db
+		}
+
+		this.logger.succ('cleaning of remote notes completed.');
+
+		return {
+			deletedCount: stats.deletedCount,
+			oldest: stats.oldest,
+			newest: stats.newest,
+			skipped: false,
+		};
+	}
+}
@@ -43,6 +43,10 @@ export class DeleteDriveFilesProcessorService {
 		let deletedCount = 0;
 		let cursor: MiDriveFile['id'] | null = null;

+		const total = await this.driveFilesRepository.countBy({
+			userId: user.id,
+		});
+
 		while (true) {
 			const files = await this.driveFilesRepository.find({
 				where: {
@@ -67,11 +71,7 @@ export class DeleteDriveFilesProcessorService {
 				deletedCount++;
 			}

-			const total = await this.driveFilesRepository.countBy({
-				userId: user.id,
-			});
-
-			job.updateProgress(deletedCount / total);
+			job.updateProgress(deletedCount / total * 100);
 		}

 		this.logger.succ(`All drive files (${deletedCount}) of ${user.id} has been deleted.`);
@@ -58,6 +58,10 @@ export class ExportBlockingProcessorService {
 			let exportedCount = 0;
 			let cursor: MiBlocking['id'] | null = null;

+			const total = await this.blockingsRepository.countBy({
+				blockerId: user.id,
+			});
+
 			while (true) {
 				const blockings = await this.blockingsRepository.find({
 					where: {
@@ -97,11 +101,7 @@ export class ExportBlockingProcessorService {
 					exportedCount++;
 				}

-				const total = await this.blockingsRepository.countBy({
-					blockerId: user.id,
-				});
-
-				job.updateProgress(exportedCount / total);
+				job.updateProgress(exportedCount / total * 100);
 			}

 			stream.end();
@@ -95,6 +95,10 @@ export class ExportClipsProcessorService {
 		let exportedClipsCount = 0;
 		let cursor: MiClip['id'] | null = null;

+		const total = await this.clipsRepository.countBy({
+			userId: user.id,
+		});
+
 		while (true) {
 			const clips = await this.clipsRepository.find({
 				where: {
@@ -126,11 +130,7 @@ export class ExportClipsProcessorService {
 				exportedClipsCount++;
 			}

-			const total = await this.clipsRepository.countBy({
-				userId: user.id,
-			});
-
-			job.updateProgress(exportedClipsCount / total);
+			job.updateProgress(exportedClipsCount / total * 100);
 		}
 	}

@@ -78,6 +78,10 @@ export class ExportFavoritesProcessorService {
 			let exportedFavoritesCount = 0;
 			let cursor: MiNoteFavorite['id'] | null = null;

+			const total = await this.noteFavoritesRepository.countBy({
+				userId: user.id,
+			});
+
 			while (true) {
 				const favorites = await this.noteFavoritesRepository.find({
 					where: {
@@ -109,11 +113,7 @@ export class ExportFavoritesProcessorService {
 					exportedFavoritesCount++;
 				}

-				const total = await this.noteFavoritesRepository.countBy({
-					userId: user.id,
-				});
-
-				job.updateProgress(exportedFavoritesCount / total);
+				job.updateProgress(exportedFavoritesCount / total * 100);
 			}

 			await write(']');
@@ -58,6 +58,10 @@ export class ExportMutingProcessorService {
 			let exportedCount = 0;
 			let cursor: MiMuting['id'] | null = null;

+			const total = await this.mutingsRepository.countBy({
+				muterId: user.id,
+			});
+
 			while (true) {
 				const mutes = await this.mutingsRepository.find({
 					where: {
@@ -98,11 +102,7 @@ export class ExportMutingProcessorService {
 					exportedCount++;
 				}

-				const total = await this.mutingsRepository.countBy({
-					muterId: user.id,
-				});
-
-				job.updateProgress(exportedCount / total);
+				job.updateProgress(exportedCount / total * 100);
 			}

 			stream.end();
@@ -37,6 +37,8 @@ class NoteStream extends ReadableStream<Record<string, unknown>> {
 		let exportedNotesCount = 0;
 		let cursor: MiNote['id'] | null = null;

+		const totalPromise = notesRepository.countBy({ userId });
+
 		const serialize = (
 			note: MiNote,
 			poll: MiPoll | null,
@@ -88,8 +90,8 @@ class NoteStream extends ReadableStream<Record<string, unknown>> {
 					exportedNotesCount++;
 				}

-				const total = await notesRepository.countBy({ userId });
-				job.updateProgress(exportedNotesCount / total);
+				const total = await totalPromise;
+				job.updateProgress(exportedNotesCount / total * 100);
 			},
 		});
 	}
@@ -482,9 +482,19 @@ export class ActivityPubServerService {
 					return true;
 				},
 				dbFallback: async (untilId, sinceId, limit) => {
-					return await this.getUserNotesFromDb(sinceId, untilId, limit, user.id);
+					return await this.getUserNotesFromDb({
+						untilId,
+						sinceId,
+						limit,
+						userId: user.id,
+					});
 				},
-			}) : await this.getUserNotesFromDb(sinceId ?? null, untilId ?? null, limit, user.id);
+			}) : await this.getUserNotesFromDb({
+				untilId: untilId ?? null,
+				sinceId: sinceId ?? null,
+				limit,
+				userId: user.id,
+			});

 			if (sinceId) notes.reverse();

@@ -523,16 +533,21 @@ export class ActivityPubServerService {
 	}

 	@bindThis
-	private async getUserNotesFromDb(untilId: string | null, sinceId: string | null, limit: number, userId: MiUser['id']) {
-		return await this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), sinceId, untilId)
-			.andWhere('note.userId = :userId', { userId })
+	private async getUserNotesFromDb(ps: {
+		untilId: string | null,
+		sinceId: string | null,
+		limit: number,
+		userId: MiUser['id'],
+	}) {
+		return await this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+			.andWhere('note.userId = :userId', { userId: ps.userId })
 			.andWhere(new Brackets(qb => {
 				qb
 					.where('note.visibility = \'public\'')
 					.orWhere('note.visibility = \'home\'');
 			}))
 			.andWhere('note.localOnly = FALSE')
-			.limit(limit)
+			.limit(ps.limit)
 			.getMany();
 	}

@@ -40,8 +40,8 @@ export class GetterService {
 	}

 	@bindThis
-	public async getNoteWithUser(noteId: MiNote['id']) {
-		const note = await this.notesRepository.findOne({ where: { id: noteId }, relations: ['user'] });
+	public async getNoteWithRelations(noteId: MiNote['id']) {
+		const note = await this.notesRepository.findOne({ where: { id: noteId }, relations: ['user', 'reply', 'renote', 'reply.user', 'renote.user'] });

 		if (note == null) {
 			throw new IdentifiableError('9725d0ce-ba28-4dde-95a7-2cbb2c15de24', 'No such note.');
@@ -129,7 +129,8 @@ export class SignupApiService {

 		let ticket: MiRegistrationTicket | null = null;

-		if (this.meta.disableRegistration) {
+		// テスト時はこの機構は障害となるため無効にする
+		if (process.env.NODE_ENV !== 'test' && this.meta.disableRegistration) {
 			if (invitationCode == null || typeof invitationCode !== 'string') {
 				reply.code(400);
 				return;
@@ -70,6 +70,7 @@ export * as 'admin/queue/inbox-delayed' from './endpoints/admin/queue/inbox-dela
 export * as 'admin/queue/retry-job' from './endpoints/admin/queue/retry-job.js';
 export * as 'admin/queue/remove-job' from './endpoints/admin/queue/remove-job.js';
 export * as 'admin/queue/show-job' from './endpoints/admin/queue/show-job.js';
+export * as 'admin/queue/show-job-logs' from './endpoints/admin/queue/show-job-logs.js';
 export * as 'admin/queue/promote-jobs' from './endpoints/admin/queue/promote-jobs.js';
 export * as 'admin/queue/jobs' from './endpoints/admin/queue/jobs.js';
 export * as 'admin/queue/stats' from './endpoints/admin/queue/stats.js';
@@ -168,6 +169,7 @@ export * as 'clips/update' from './endpoints/clips/update.js';
 export * as 'drive' from './endpoints/drive.js';
 export * as 'drive/files' from './endpoints/drive/files.js';
 export * as 'drive/files/attached-notes' from './endpoints/drive/files/attached-notes.js';
+export * as 'drive/files/attached-chat-messages' from './endpoints/drive/files/attached-chat-messages.js';
 export * as 'drive/files/check-existence' from './endpoints/drive/files/check-existence.js';
 export * as 'drive/files/create' from './endpoints/drive/files/create.js';
 export * as 'drive/files/delete' from './endpoints/drive/files/delete.js';
@@ -208,6 +210,7 @@ export * as 'flash/my-likes' from './endpoints/flash/my-likes.js';
 export * as 'flash/show' from './endpoints/flash/show.js';
 export * as 'flash/unlike' from './endpoints/flash/unlike.js';
 export * as 'flash/update' from './endpoints/flash/update.js';
+export * as 'flash/search' from './endpoints/flash/search.js';
 export * as 'following/create' from './endpoints/following/create.js';
 export * as 'following/delete' from './endpoints/following/delete.js';
 export * as 'following/invalidate' from './endpoints/following/invalidate.js';
@@ -307,6 +310,11 @@ export * as 'notes/clips' from './endpoints/notes/clips.js';
 export * as 'notes/conversation' from './endpoints/notes/conversation.js';
 export * as 'notes/create' from './endpoints/notes/create.js';
 export * as 'notes/delete' from './endpoints/notes/delete.js';
+export * as 'notes/drafts/list' from './endpoints/notes/drafts/list.js';
+export * as 'notes/drafts/create' from './endpoints/notes/drafts/create.js';
+export * as 'notes/drafts/delete' from './endpoints/notes/drafts/delete.js';
+export * as 'notes/drafts/update' from './endpoints/notes/drafts/update.js';
+export * as 'notes/drafts/count' from './endpoints/notes/drafts/count.js';
 export * as 'notes/favorites/create' from './endpoints/notes/favorites/create.js';
 export * as 'notes/favorites/delete' from './endpoints/notes/favorites/delete.js';
 export * as 'notes/featured' from './endpoints/notes/featured.js';
@@ -428,4 +436,5 @@ export * as 'chat/rooms/invitations/ignore' from './endpoints/chat/rooms/invitat
 export * as 'chat/rooms/invitations/inbox' from './endpoints/chat/rooms/invitations/inbox.js';
 export * as 'chat/rooms/invitations/outbox' from './endpoints/chat/rooms/invitations/outbox.js';
 export * as 'chat/history' from './endpoints/chat/history.js';
+export * as 'chat/read-all' from './endpoints/chat/read-all.js';
 export * as 'v2/admin/emoji/list' from './endpoints/v2/admin/emoji/list.js';
@@ -98,6 +98,8 @@ export const paramDef = {
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
+		sinceDate: { type: 'integer' },
+		untilDate: { type: 'integer' },
 		state: { type: 'string', nullable: true, default: null },
 		reporterOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
 		targetUserOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
@@ -115,7 +117,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queryService: QueryService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const query = this.queryService.makePaginationQuery(this.abuseUserReportsRepository.createQueryBuilder('report'), ps.sinceId, ps.untilId);
+			const query = this.queryService.makePaginationQuery(this.abuseUserReportsRepository.createQueryBuilder('report'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate);

 			switch (ps.state) {
 				case 'resolved': query.andWhere('report.resolved = TRUE'); break;
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .10.0
 .15.0