2023.12.0-beta.4

* rich autocomplete for use in profiles, announcements, and channel descriptions

* implementation omissions

* add tab, apply to page editor, and fix something

* componentization

* fix nyaize doesn't working in profile preview

* detach autocomplete instance when unmounted

* fix: mismatched camelCase

* remove unused / unnecessary styles

* update CHANGELOG.md

* fix lint

* remove dump.rdb

* props.richAutocomplete -> autocomplete

* Update packages/frontend/src/scripts/autocomplete.ts

* clarify namings
メンションなども「MFM」に含まれるのか自信がなかったのでrichSyntaxなどとぼかしていましたが、含むようなので変更しました

* tweak

* Update MkFormDialog.vue

* rename

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

.config/docker_example.yml

@@ -56,17 +56,17 @@ dbReplications: false
 # You can configure any number of replicas here
 #dbSlaves:
 #  -
-#    host: 
-#    port: 
-#    db: 
-#    user: 
-#    pass: 
+#    host:
+#    port:
+#    db:
+#    user:
+#    pass:
 #  -
-#    host: 
-#    port: 
-#    db: 
-#    user: 
-#    pass: 
+#    host:
+#    port:
+#    db:
+#    user:
+#    pass:
 
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
@@ -106,12 +106,16 @@ redis:
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 
+# You can set scope to local (default value) or global 
+# (include notes from remote).
+
 #meilisearch:
 #  host: meilisearch
 #  port: 7700
 #  apiKey: ''
 #  ssl: true
 #  index: ''
+#  scope: local
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -147,7 +151,7 @@ id: 'aidx'
 
 # Job rate limiter
 # deliverJobPerSec: 128
-# inboxJobPerSec: 16
+# inboxJobPerSec: 32
 
 # Job attempts
 # deliverJobMaxAttempts: 12
@@ -180,6 +184,9 @@ proxyRemoteFiles: true
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true
 
+# For security reasons, uploading attachments from the intranet is prohibited,
+# but exceptions can be made from the following settings. Default value is "undefined". 
+# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]

.config/example.yml

@@ -118,6 +118,9 @@ redis:
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 
+# You can set scope to local (default value) or global 
+# (include notes from remote).
+
 #meilisearch:
 #  host: localhost
 #  port: 7700
@@ -163,7 +166,7 @@ id: 'aidx'
 
 # Job rate limiter
 #deliverJobPerSec: 128
-#inboxJobPerSec: 16
+#inboxJobPerSec: 32
 #relashionshipJobPerSec: 64
 
 # Job attempts
@@ -210,6 +213,9 @@ proxyRemoteFiles: true
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true
 
+# For security reasons, uploading attachments from the intranet is prohibited,
+# but exceptions can be made from the following settings. Default value is "undefined". 
+# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
 			"version": "8.9.2"
 		},
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "20.5.1"
+			"version": "20.10.0"
 		}
 	},
 	"forwardPorts": [3000],

.devcontainer/devcontainer.yml

@@ -56,17 +56,17 @@ dbReplications: false
 # You can configure any number of replicas here
 #dbSlaves:
 #  -
-#    host: 
-#    port: 
-#    db: 
-#    user: 
-#    pass: 
+#    host:
+#    port:
+#    db:
+#    user:
+#    pass:
 #  -
-#    host: 
-#    port: 
-#    db: 
-#    user: 
-#    pass: 
+#    host:
+#    port:
+#    db:
+#    user:
+#    pass:
 
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
@@ -147,7 +147,7 @@ id: 'aidx'
 
 # Job rate limiter
 # deliverJobPerSec: 128
-# inboxJobPerSec: 16
+# inboxJobPerSec: 32
 
 # Job attempts
 # deliverJobMaxAttempts: 12

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -1,60 +0,0 @@
----
-name: 🐛 Bug Report
-about: Create a report to help us improve
-title: ''
-labels: ⚠️bug?
-assignees: ''
-
----
-
-<!--
-Thanks for reporting!
-First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported.
-Also, If you are NOT owner/admin of server, PLEASE DONT REPORT SERVER SPECIFIC ISSUES TO HERE! (e.g. feature XXX is not working in misskey.example) Please try with another misskey servers, and if your issue is only reproducible with specific server, contact your server's owner/admin first.
--->
-
-## 💡 Summary
-
-<!-- Tell us what the bug is -->
-
-## 🥰 Expected Behavior
-
-<!--- Tell us what should happen -->
-
-## 🤬 Actual Behavior
-
-<!--
-Tell us what happens instead of the expected behavior.
-Please include errors from the developer console and/or server log files if you have access to them.
--->
-
-## 📝 Steps to Reproduce
-
-1.
-2.
-3.
-
-## 📌 Environment
-
-<!-- Tell us where on the platform it happens -->
-<!-- DO NOT WRITE "latest". Please provide the specific version. -->
-
-### 💻 Frontend
-* Model and OS of the device(s):
-  <!-- Example: MacBook Pro (14inch, 2021), macOS Ventura 13.4 -->
-* Browser:
-  <!-- Example: Chrome 113.0.5672.126 -->
-* Server URL:
-  <!-- Example: misskey.io -->
-* Misskey:
-  13.x.x
-
-### 🛰 Backend (for server admin)
-<!-- If you are using a managed service, put that after the version. -->
-
-* Installation Method or Hosting Service: <!-- Example: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment -->
-* Misskey: 13.x.x
-* Node: 20.x.x
-* PostgreSQL: 15.x.x
-* Redis: 7.x.x
-* OS and Architecture: <!-- Example: Ubuntu 22.04.2 LTS aarch64 -->

.github/ISSUE_TEMPLATE/01_bug-report.yml

@@ -0,0 +1,91 @@
+name: 🐛 Bug Report
+description: Create a report to help us improve
+labels: ["⚠️bug?"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting!
+        First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported.
+        Also, If you are NOT owner/admin of server, PLEASE DONT REPORT SERVER SPECIFIC ISSUES TO HERE! (e.g. feature XXX is not working in misskey.example) Please try with another misskey servers, and if your issue is only reproducible with specific server, contact your server's owner/admin first.
+
+  - type: textarea
+    attributes:
+      label: 💡 Summary
+      description: Tell us what the bug is
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: 🥰 Expected Behavior
+      description: Tell us what should happen
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: 🤬 Actual Behavior
+      description: |
+        Tell us what happens instead of the expected behavior.
+        Please include errors from the developer console and/or server log files if you have access to them.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: 📝 Steps to Reproduce
+      placeholder: |
+        1.
+        2.
+        3.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: 💻 Frontend Environment
+      description: |
+        Tell us where on the platform it happens
+        DO NOT WRITE "latest". Please provide the specific version.
+
+        Examples:
+          * Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
+          * Browser: Chrome 113.0.5672.126
+          * Server URL: misskey.io
+          * Misskey: 13.x.x
+      value: |
+        * Model and OS of the device(s):
+        * Browser:
+        * Server URL:
+        * Misskey:
+      render: markdown
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: 🛰 Backend Environment (for server admin)
+      description: |
+        Tell us where on the platform it happens
+        DO NOT WRITE "latest". Please provide the specific version.
+        If you are using a managed service, put that after the version.
+
+        Examples:
+          * Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
+          * Misskey: 13.x.x
+          * Node: 20.x.x
+          * PostgreSQL: 15.x.x
+          * Redis: 7.x.x
+          * OS and Architecture: Ubuntu 22.04.2 LTS aarch64
+      value: |
+        * Installation Method or Hosting Service:
+        * Misskey:
+        * Node:
+        * PostgreSQL:
+        * Redis:
+        * OS and Architecture:
+      render: markdown
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/02_feature-request.md

@@ -1,12 +0,0 @@
----
-name: ✨ Feature Request
-about: Suggest an idea for this project
-title: ''
-labels: ✨Feature
-assignees: ''
-
----
-
-## Summary
-
-<!-- Tell us what the suggestion is -->

.github/ISSUE_TEMPLATE/02_feature-request.yml

@@ -0,0 +1,17 @@
+name: ✨ Feature Request
+description: Suggest an idea for this project
+labels: ["✨Feature"]
+
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Tell us what the suggestion is
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Purpose
+      description: Describe the specific problem or need you think this feature will solve, and who it will help.
+    validations:
+      required: true

.github/labeler.yml

@@ -1,21 +1,34 @@
 'packages/backend':
-- packages/backend/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['packages/backend/**/*']
 
 'packages/backend:test':
-- packages/backend/test/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['packages/backend/test/**/*']
 
 'packages/frontend':
-- packages/frontend/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['packages/frontend/**/*']
 
 'packages/frontend:test':
-- cypress/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['cypress/**/*']
 
 'packages/sw':
-- packages/sw/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['packages/sw/**/*']
 
 'packages/misskey-js':
-- packages/misskey-js/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['packages/misskey-js/**/*']
 
 'packages/misskey-js:test':
-- packages/misskey-js/test/**/*
-- packages/misskey-js/test-d/**/*
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['packages/misskey-js/test/**/*', 'packages/misskey-js/test-d/**/*']

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

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

.github/workflows/check_copyright_year.yml

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

.github/workflows/docker-develop.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/docker.yml

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

.github/workflows/dockle.yml

@@ -14,13 +14,13 @@ jobs:
     env:
       DOCKER_CONTENT_TRUST: 1
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
           sudo dpkg -i dockle.deb
       - run: |
           cp .config/docker_example.env .config/docker.env
-          cp ./docker-compose.yml.example ./docker-compose.yml
+          cp ./docker-compose_example.yml ./docker-compose.yml
       - run: |
           docker compose up -d web
           docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest

.github/workflows/get-api-diff.yml

@@ -0,0 +1,73 @@
+# this name is used in report-api-diff.yml so be careful when change name
+name: Get api.json from Misskey
+
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+    paths:
+      - packages/backend/**
+      - .github/workflows/get-api-diff.yml
+
+jobs:
+  get-from-misskey:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    strategy:
+      matrix:
+        node-version: [20.10.0]
+        api-json-name: [api-base.json, api-head.json]
+        include:
+          - api-json-name: api-base.json
+            ref: ${{ github.base_ref }}
+          - api-json-name: api-head.json
+            ref: refs/pull/${{ github.event.number }}/merge
+
+    steps:
+    - uses: actions/checkout@v4.1.1
+      with:
+        ref: ${{ matrix.ref }}
+        submodules: true
+    - name: Install pnpm
+      uses: pnpm/action-setup@v2
+      with:
+        version: 8
+        run_install: false
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4.0.0
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'pnpm'
+    - run: corepack enable
+    - run: pnpm i --frozen-lockfile
+    - name: Check pnpm-lock.yaml
+      run: git diff --exit-code pnpm-lock.yaml
+    - name: Copy Configure
+      run: cp .config/example.yml .config/default.yml
+    - name: Build
+      run: pnpm build
+    - name: Generate API JSON
+      run: pnpm --filter backend generate-api-json
+    - name: Copy API.json
+      run: cp packages/backend/built/api.json ${{ matrix.api-json-name }}
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: api-artifact
+        path: ${{ matrix.api-json-name }}
+
+  save-pr-number:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Save PR number
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+        run: |
+          echo "$PR_NUMBER" > ./pr_number
+      - uses: actions/upload-artifact@v3
+        with:
+          name: api-artifact
+          path: pr_number

.github/workflows/labeler.yml

@@ -11,6 +11,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

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

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

@@ -13,7 +13,7 @@ jobs:
       github.event.client_payload.slash_command.sha != '' &&
       contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
     steps:
-    - uses: actions/github-script@v6.3.3
+    - uses: actions/github-script@v7
       id: check-id
       env:
         number: ${{ github.event.client_payload.pull_request.number }}
@@ -37,7 +37,7 @@ jobs:
 
           return check[0].id;
 
-    - uses: actions/github-script@v6.3.3
+    - uses: actions/github-script@v7
       env:
         check_id: ${{ steps.check-id.outputs.result }}
         details_url: ${{ github.server_url }}/${{ github.repository }}/runs/${{ github.run_id }}
@@ -53,7 +53,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 
@@ -72,7 +72,7 @@ jobs:
         timeout: 15m
 
     # Update check run called "integration-fork"
-    - uses: actions/github-script@v6.3.3
+    - uses: actions/github-script@v7
       id: update-check-run
       if: ${{ always() }}
       env:

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

@@ -10,7 +10,7 @@ jobs:
   destroy-preview-environment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6.3.3
+      - uses: actions/github-script@v7
         id: check-conclusion
         env:
           number: ${{ github.event.number }}

.github/workflows/report-api-diff.yml

@@ -0,0 +1,85 @@
+name: Report API Diff
+
+on:
+  workflow_run:
+    types: [completed]
+    workflows:
+      - Get api.json from Misskey # get-api-diff.yml
+
+jobs:
+  compare-diff:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    permissions:
+      pull-requests: write
+
+# api-artifact
+    steps:
+      - name: Download artifact
+        uses: actions/github-script@v7
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "api-artifact"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/api-artifact.zip`, Buffer.from(download.data));
+      - name: Extract artifact
+        run: unzip api-artifact.zip -d artifacts
+      - name: Load PR Number
+        id: load-pr-num
+        run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT"
+
+      - name: Output base
+        run: cat ./artifacts/api-base.json
+      - name: Output head
+        run: cat ./artifacts/api-head.json
+      - name: Arrange json files
+        run: |
+          jq '.' ./artifacts/api-base.json > ./api-base.json
+          jq '.' ./artifacts/api-head.json > ./api-head.json
+      - name: Get diff of 2 files
+        run: diff -u --label=base --label=head ./api-base.json ./api-head.json | cat > api.json.diff
+      - name: Get full diff
+        run: diff --label=base --label=head --new-line-format='+%L' --old-line-format='-%L' --unchanged-line-format=' %L' ./api-base.json ./api-head.json | cat > api-full.json.diff
+      - name: Echo full diff
+        run: cat ./api-full.json.diff
+      - name: Upload full diff to Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: api-artifact
+          path: |
+            api-full.json.diff
+            api-base.json
+            api-head.json
+      - id: out-diff
+        name: Build diff Comment
+        run: |
+          cat <<- EOF > ./output.md
+          このPRによるapi.jsonの差分
+          <details>
+          <summary>差分はこちら</summary>
+
+          \`\`\`diff
+          $(cat ./api.json.diff)
+          \`\`\`
+          </details>
+
+          [Get diff files from Workflow Page](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})
+          EOF
+      - uses: thollander/actions-comment-pull-request@v2
+        with:
+          pr_number: ${{ steps.load-pr-num.outputs.pr-number }}
+          comment_tag: show_diff
+          filePath: ./output.md

.github/workflows/test-backend.yml

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

.github/workflows/test-frontend.yml

@@ -13,10 +13,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.5.1]
+        node-version: [20.10.0]
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         submodules: true
     - name: Install pnpm
@@ -25,7 +25,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.8.1
+      uses: actions/setup-node@v4.0.0
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20.5.1]
+        node-version: [20.10.0]
         browser: [chrome]
 
     services:
@@ -68,7 +68,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150
@@ -83,7 +83,7 @@ jobs:
         version: 7
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.8.1
+      uses: actions/setup-node@v4.0.0
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

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

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

.github/workflows/test-production.yml

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

.node-version

@@ -1 +1 @@
-20.5.1
+20.10.0

CHANGELOG.md

@@ -5,7 +5,8 @@
 -
 
 ### Client
--
+- Fix: ページ一覧ページの表示がモバイル環境において崩れているのを修正
+- Fix: MFMでルビの中のテキストがnyaizeされない問題を修正
 
 ### Server
 -
@@ -14,22 +15,200 @@
 
 ## 2023.x.x (unreleased)
 
+### General
+- Feat: メールアドレスの認証にverifymail.ioを使えるように (cherry-pick from https://github.com/TeamNijimiss/misskey/commit/971ba07a44550f68d2ba31c62066db2d43a0caed)
+- Feat: モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加 (cherry-pick from https://github.com/TeamNijimiss/misskey/commit/e0eb5a752f6e5616d6312bb7c9790302f9dbff83)
+- Feat: TL上からノートが見えなくなるワードミュートであるハードミュートを追加
+- Enhance: アイコンデコレーションを複数設定できるように
+- Fix: MFM `$[unixtime ]` に不正な値を入力した際に発生する各種エラーを修正
+
+### Client
+- Feat: 今日誕生日のフォロー中のユーザーを一覧表示できるウィジェットを追加
+- Feat: データセーバーでコードハイライトの読み込みを削減できるように
+- Enhance: 投稿フォームの絵文字ピッカーをリアクション時に使用するものと同じのを使用するように #12336
+- Enhance: 絵文字のオートコンプリート機能強化 #12364
+- Enhance: ユーザーのRawデータを表示するページが復活
+- Enhance: リアクション選択時に音を鳴らせるように
+- Enhance: サウンドにドライブのファイルを使用できるように
+- Enhance: ナビゲーションバーに項目「キャッシュを削除」を追加
+- Enhance: Shareページで投稿を完了すると、親ウィンドウ（親フレーム）にpostMessageするように
+- Enhance: チャンネル、クリップ、ページ、Play、ギャラリーにURLのコピーボタンを設置 #11305
+- Enhance: ノートプレビューに「内容を隠す」が反映されるように
+- Enhance: データセーバーの適用範囲を個別で設定できるように
+	- 従来のデータセーバーの設定はリセットされます
+- Enhance: タイムライン上のタブからリスト、アンテナ、チャンネルの管理ページにジャンプできるように
+- Enhance: ユーザー名、プロフィール、お知らせ、ページの編集画面でMFMや絵文字のオートコンプリートが使用できるように
+- Enhance: プロフィール、お知らせの編集画面でMFMのプレビューを表示できるように
+- Feat: センシティブと判断されたウェブサイトのサムネイルをぼかすように
+  - ウェブサイトをセンシティブと判断する仕組みが動いていないため、summalyProxyを使用しないと機能しません。
+- fix: 「設定のバックアップ」で一部の項目がバックアップに含まれていなかった問題を修正
+- Fix: ウィジェットのジョブキューにて音声の発音方法変更に追従できていなかったのを修正 #12367
+- Enhance: 絵文字の詳細ページに記載される情報を追加
+- Fix: コードエディタが正しく表示されない問題を修正
+- Fix: プロフィールの「ファイル」にセンシティブな画像がある際のデザインを修正
+- Fix: 一度に大量の通知が入った際に通知音が音割れする問題を修正
+- Fix: 共有機能をサポートしていないブラウザの場合は共有ボタンを非表示にする #11305
+- Fix: 通知のグルーピング設定を変更してもリロードされるまで表示が変わらない問題を修正 #12470
+- Fix: 長い名前のチャンネルにおける投稿フォームの表示が崩れる問題を修正
+- Fix: セキュリティ向上のためAiScriptの`Mk:apiExternal`を無効化
+- Fix: ノート中の絵文字をタップして「リアクションする」からリアクションした際にリアクションサウンドが鳴らない不具合を修正
+
+### Server
+- Enhance: MFM `$[ruby ]` が他ソフトウェアと連合されるように
+- Enhance: Meilisearchを有効にした検索で、ユーザーのミュートやブロックを考慮するように
+- Fix: 時間経過により無効化されたアンテナを再有効化したとき、サーバ再起動までその状況が反映されないのを修正 #12303
+- Fix: ロールタイムラインが保存されない問題を修正
+- Fix: api.jsonの生成ロジックを改善 #12402
+- Fix: 招待コードが使い回せる問題を修正
+- Fix: 特定の条件下でチャンネルやユーザーのノート一覧に最新のノートが表示されなくなる問題を修正
+- Fix: 何もノートしていないユーザーのフィードにアクセスするとエラーになる問題を修正
+- Fix: リストタイムラインにてミュートが機能しないケースがある問題と、チャンネル投稿がストリーミングで流れてきてしまう問題を修正 #10443
+- Fix: 「みつける」のなかにミュートしたユーザが現れてしまう問題を修正 #12383
+- Fix: Social/Local/Home Timelineにてインスタンスミュートが効かない問題
+- Fix: ユーザのノート一覧にてインスタンスミュートが効かない問題
+- Fix: チャンネルのノート一覧にてインスタンスミュートが効かない問題
+- Fix: 「みつける」が年越し時に壊れる問題を修正
+- Fix: アカウントをブロックした際に、自身のユーザーのページでノートが相手に表示される問題を修正
+- Fix: モデレーションログがモデレーターは閲覧できないように修正
+
+## 2023.11.1
+
+### Note
+- 悪意のある第三者がリモートユーザーになりすました任意のアクティビティを受け取れてしまう問題を修正しました。詳しくは[GitHub security advisory](https://github.com/misskey-dev/misskey/security/advisories/GHSA-3f39-6537-3cgc)をご覧ください。
+
+### General
+- Feat: 管理者がコントロールパネルからメールアドレスの照会を行えるようになりました
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
+- Enhance: json-schema(OpenAPIの戻り値として使用されるスキーマ定義)を出来る限り最新化 #12311
+
+### Client
+- Enhance: MFMでルビを振れるように
+	- 例: `$[ruby 三須木 みすき]`
+- Enhance: MFMでUNIX時間を指定して日時を表示できるように
+	- 例: `$[unixtime 1701356400]`
+- Enhance: プラグインでエラーが発生した場合のハンドリングを強化
+- Enhance: 細かなUIのブラッシュアップ
+- Enhance: サウンド設定に「サウンドを出力しない」と「Misskeyがアクティブな時のみサウンドを出力する」を追加
+- Fix: 効果音が再生されるとデバイスで再生している動画や音声が停止する問題を修正 #12339
+- Fix: デッキに表示されたチャンネルの表示先チャンネルを切り替えた際、即座に反映されない問題を修正 #12236
+- Fix: プラグインでノートの表示を書き換えられない問題を修正
+- Fix: アイコンデコレーションが見切れる場合がある問題を修正
+- Fix: 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正
+- Fix: 非ログイン時に「メモを追加」を表示しないように変更 #12309
+- Fix: 絵文字ピッカーでの検索が更新されない問題を修正
+- Fix: 特定の条件下でノートがnyaizeされない問題を修正
+
+### Server
+- Enhance: FTTのデータベースへのフォールバック処理を行うかどうかを設定可能に
+- Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように
+- Fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないようにされました
+- Fix: ユーザタイムラインの「ノート」選択時にリノートが混ざり込んでしまうことがある問題の修正 #12306
+- Fix: LTLに特定条件下にてチャンネルへの投稿が混ざり込む現象を修正
+- Fix: ActivityPub: 追加情報のカスタム絵文字がユーザー情報のtagに含まれない問題を修正
+- Fix: ActivityPubに関するセキュリティの向上
+- Fix: 非公開の投稿に対して返信できないように
+
+## 2023.11.0
+
+### Note
+- iOS 16.4未満を使用している場合はiOS 16.4以上にアップデートをお願いします
+
+### General
+- Feat: アイコンデコレーション機能
+	- サーバーで用意された画像をアイコンに重ねることができます
+	- 画像のテンプレートはこちらです: https://misskey-hub.net/avatar-decoration-template.png
+		- 最大でも黄色いエリア内にデコレーションを収めることを推奨します。
+		- 画像は512x512pxを推奨します。
+- Feat: チャンネル設定にリノート／引用リノートの可否を設定できる項目を追加
+- Enhance: アカウント登録時のメールアドレス認証に30分の有効期限を設定
+  - 有効期限が切れた後であれば、登録時に使用した招待コードを再度利用できるように変更しました。
+  - ユーザーが誤ったメールアドレスを入力した場合に招待コードが失効してしまう問題が解消されます。
+- Enhance: すでにフォローしたすべての人の返信をTLに追加できるように
+- Enhance: 未読の通知数を表示できるように
+- Enhance: 通知されず、確認の必要もないお知らせ(silence)を作成可能になりました
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
+- Change: CWを使用する場合、注釈を空にすることは許可されなくなりました
+
+### Client
+- Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました
+	- 外部サイトでの実装が必要です。詳細は Misskey Hub をご覧ください
+	  https://misskey-hub.net/docs/advanced/publish-on-your-website.html
+- Feat: 通知をグルーピングして表示するオプション(オプトアウト)
+- Feat: Misskeyの基本的なチュートリアルを実装
+- Feat: スワイプしてタイムラインを再読込できるように
+	- PCの場合は右上のボタンからでも再読込できます
+- Enhance: タイムラインの自動更新を無効にできるように
+- Enhance: コードのシンタックスハイライトエンジンをShikiに変更
+  - AiScriptのシンタックスハイライトに対応
+  - MFMでAiScriptをハイライトする場合、コードブロックの開始部分を ` ```is ` もしくは ` ```aiscript ` としてください
+- Enhance: データセーバー有効時はアニメーション付きのアバター画像が停止するように
+- Enhance: プラグインを削除した際には、使用されていたアクセストークンも同時に削除されるようになりました
+- Enhance: プラグインで`Plugin:register_note_view_interruptor`を用いてnoteの代わりにnullを返却することでノートを非表示にできるようになりました
+- Enhance: AiScript関数`Mk:nyaize()`が追加されました
+- Enhance: 情報→ツール はナビゲーションバーにツールとして独立した項目になりました
+- Enhance: ノート内の絵文字をクリックすることで、コピーおよびリアクションができるように
+- Enhance: その他細かなブラッシュアップ
+- Fix: 投稿フォームでのユーザー変更がプレビューに反映されない問題を修正
+- Fix: ユーザーページの ノート > ファイル付き タブにリプライが表示されてしまう
+- Fix: 「検索」MFMにおいて一部の検索キーワードが正しく認識されない問題を修正
+- Fix: 一部の言語でMisskey Webがクラッシュする問題を修正
+- Fix: チャンネルの作成・更新時に失敗した場合何も表示されない問題を修正 #11983
+- Fix: 個人カードのemojiがバッテリーになっている問題を修正
+- Fix: 標準テーマと同じIDを使用してインストールできてしまう問題を修正
+- Fix: 絵文字ピッカーでバッテリーの絵文字が複数表示される問題を修正 #12197
+- Fix: 11以上されているリアクションにおいてツールチップで示されるリアクション数が本来よりも1多い問題を修正 #12174
+- Fix: サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 #12224
+- Fix: In deck layout, replies option is not saved after refresh
+- Fix: アーカイブしたお知らせがコントロールパネルに表示される問題を修正
+- Note: アップデート後、サウンドに関する設定が初期化されます
+
+### Server
+- Feat: Registry APIがサードパーティから利用可能になりました
+- Enhance: RedisへのTLのキャッシュ(FTT)をオフにできるように
+- Enhance: フォローしているチャンネルをフォロー解除した時（またはその逆）、タイムラインに反映される間隔を改善
+- Enhance: プロフィールの自己紹介欄のMFMが連合するようになりました
+	- 相手がMisskey v2023.11.0以降である必要があります
+- Enhance: チャンネル取得時のパフォーマンスを向上
+- Enhance: AP: ApplicationタイプのアカウントをisBotとして扱うように
+- Fix: リストTLに自分のフォロワー限定投稿が含まれない問題を修正
+- Fix: ローカルタイムラインに投稿者自身の投稿への返信が含まれない問題を修正
+- Fix: 自分のフォローしているユーザーの自分のフォローしていないユーザーの visibility: followers な投稿への返信がストリーミングで流れてくる問題を修正
+- Fix: RedisへのTLキャッシュが有効の場合にHTL/LTL/STLが空になることがある問題を修正
+- Fix: STLでフォローしていないチャンネルが取得される問題を修正
+- Fix: `hashtags/trend`にてRedisからトレンドの情報が取得できない際にInternal Server Errorになる問題を修正
+- Fix: HTLをリロードまたは遡行したとき、フォローしているチャンネルのノートが含まれない問題を修正 #11765 #12181
+- Fix: リノートをリノートできるのを修正
+- Fix: アクセストークンを削除すると、通知が取得できなくなる場合がある問題を修正
+- Fix: 自身の宛先なしダイレクト投稿がストリーミングで流れてこない問題を修正
+- Fix: サーバーサイドからのテスト通知を正しく行えるように修正
+- Fix: GTLの「リノートを表示」オプションが機能しないのを修正 #12233
+
+## 2023.10.2
+
 ### General
 - Feat: アンテナでローカルの投稿のみ収集できるようになりました
 - Feat: サーバーサイレンス機能が追加されました
-- Enhance: 依存関係の更新
-- Enhance: 新規にフォローした人のをデフォルトでTLに追加できるように
-- Enhance: HTLとLTLを2023.10.0アップデート以前まで遡れるように
+- Enhance: 新規にフォローした人の返信をデフォルトでTLに追加できるオプションを追加
+- Enhance: HTL/LTL/STLを2023.10.0アップデート以前まで遡れるように
 - Enhance: フォロー/フォロー解除したときに過去分のHTLにも含まれる投稿が反映されるように
-- Change: nyaizeはAPIレスポンス時ではなく投稿時に一度だけ非可逆的に行われるようになりました
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
 
 ### Client
 - Enhance: TLの返信表示オプションを記憶するように
+- Enhance: 投稿されてから時間が経過しているノートであることを視覚的に分かりやすく
+- Feat: 絵文字ピッカーのカテゴリに「/」を入れることでフォルダ分け表示できるように
 
 ### Server
+- Enhance: タイムライン取得時のパフォーマンスを向上
 - Enhance: ストリーミングAPIのパフォーマンスを向上
 - Fix: users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正
 - Fix: コントロールパネルの設定項目が正しく保存できない問題を修正
+- Fix: 管理者権限のロールを持っていても一部のAPIが使用できないことがある問題を修正
+- Change: ユーザーのisCatがtrueでも、サーバーではnyaizeが行われなくなりました
+  - isCatな場合、クライアントでnyaize処理を行うことを推奨します
 
 ## 2023.10.1
 ### General

CODE_OF_CONDUCT.md

@@ -2,45 +2,131 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at syuilotan@yahoo.co.jp. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+<syuilotan@yahoo.co.jp>.
+All complaints will be reviewed and investigated promptly and fairly.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -15,7 +15,7 @@ Before creating an issue, please check the following:
 - To avoid duplication, please search for similar issues before creating a new issue.
 - Do not use Issues to ask questions or troubleshooting.
 	- Issues should only be used to feature requests, suggestions, and bug tracking.
-	- Please ask questions or troubleshooting in ~~the [Misskey Forum](https://forum.misskey.io/)~~ [GitHub Discussions](https://github.com/misskey-dev/misskey/discussions) or [Discord](https://discord.gg/Wp8gVStHW3).
+	- Please ask questions or troubleshooting in [GitHub Discussions](https://github.com/misskey-dev/misskey/discussions) or [Discord](https://discord.gg/Wp8gVStHW3).
 
 > **Warning**
 > Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged.
@@ -117,6 +117,10 @@ command.
 - Server-side source files and automatically builds them if they are modified. Automatically start the server process(es).
 - Vite HMR (just the `vite` command) is available. The behavior may be different from production.
 - Service Worker is watched by esbuild.
+- The front end can be viewed by accessing `http://localhost:5173`.
+- The backend listens on the port configured with `port` in .config/default.yml.
+If you have not changed it from the default, it will be "http://localhost:3000".
+If "port" in .config/default.yml is set to something other than 3000, you need to change the proxy settings in packages/frontend/vite.config.local-dev.ts.
 
 ### Dev Container
 Instead of running `pnpm` locally, you can use Dev Container to set up your development environment.

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=20.5.1-bullseye
+ARG NODE_VERSION=20.10.0-bullseye
 
 # build assets & compile TypeScript
 
@@ -67,8 +67,8 @@ RUN apt-get update \
 	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
-	&& find / -type d -path /proc -prune -o -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \
-	&& find / -type d -path /proc -prune -o -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \; \
+	&& find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \
+	&& find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \; \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists
 

chart/files/default.yml

@@ -77,17 +77,17 @@ dbReplications: false
 # You can configure any number of replicas here
 #dbSlaves:
 #  -
-#    host: 
-#    port: 
-#    db: 
-#    user: 
-#    pass: 
+#    host:
+#    port:
+#    db:
+#    user:
+#    pass:
 #  -
-#    host: 
-#    port: 
-#    db: 
-#    user: 
-#    pass: 
+#    host:
+#    port:
+#    db:
+#    user:
+#    pass:
 
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
@@ -167,7 +167,7 @@ id: "aidx"
 
 # Job rate limiter
 # deliverJobPerSec: 128
-# inboxJobPerSec: 16
+# inboxJobPerSec: 32
 
 # Job attempts
 # deliverJobMaxAttempts: 12

cypress/e2e/widgets.cy.js

@@ -1,3 +1,4 @@
+/* flaky
 describe('After user signed in', () => {
 	beforeEach(() => {
 		cy.resetState();
@@ -67,3 +68,4 @@ describe('After user signed in', () => {
 	buildWidgetTest('aiscript');
 	buildWidgetTest('aichan');
 });
+*/

docker-compose.local-db.yml

@@ -0,0 +1,42 @@
+version: "3"
+
+# このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
+
+services:
+  redis:
+    restart: always
+    image: redis:7-alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - ./redis:/data
+    healthcheck:
+      test: "redis-cli ping"
+      interval: 5s
+      retries: 20
+
+  db:
+    restart: always
+    image: postgres:15-alpine
+    ports:
+      - "5432:5432"
+    env_file:
+      - .config/docker.env
+    volumes:
+      - ./db:/var/lib/postgresql/data
+    healthcheck:
+      test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+      interval: 5s
+      retries: 20
+
+#  meilisearch:
+#    restart: always
+#    image: getmeili/meilisearch:v1.3.4
+#    environment:
+#      - MEILI_NO_ANALYTICS=true
+#      - MEILI_ENV=production
+#    env_file:
+#      - .config/meilisearch.env
+#    volumes:
+#      - ./meili_data:/meili_data
+

locales/ar-SA.yml

@@ -999,6 +999,7 @@ expired: "منتهية صلاحيته"
 icon: "الصورة الرمزية"
 replies: "رد"
 renotes: "أعد النشر"
+flip: "اقلب"
 _initialAccountSetting:
   accountCreated: "نجح إنشاء حسابك!"
   letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
@@ -1261,9 +1262,6 @@ _time:
   minute: "د"
   hour: "سا"
   day: "ي"
-_timelineTutorial:
-  title: "كيف تستخدم Misskey"
-  step3_1: "هل نشرت ملاحظتك الأولى؟"
 _2fa:
   alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
   step1: "أولًا ثبّت تطبيق استيثاق على جهازك (مثل {a} و{b})."

locales/bn-BD.yml

@@ -840,6 +840,7 @@ youFollowing: "অনুসরণ করা হচ্ছে"
 icon: "প্রোফাইল ছবি"
 replies: "জবাব"
 renotes: "রিনোট"
+flip: "উল্টান"
 _role:
   priority: "অগ্রাধিকার"
   _priority:

locales/ca-ES.yml

@@ -45,6 +45,7 @@ pin: "Fixar al perfil"
 unpin: "Para de fixar del perfil"
 copyContent: "Copiar el contingut"
 copyLink: "Copiar l'enllaç"
+copyLinkRenote: "Copiar l'enllaç de la renota"
 delete: "Elimina"
 deleteAndEdit: "Elimina i edita"
 deleteAndEditConfirm: "Segur que vols eliminar aquesta publicació i editar-la? Perdràs totes les reaccions, impulsos i respostes."
@@ -110,6 +111,8 @@ renoted: "S'ha impulsat"
 cantRenote: "No es pot impulsar aquesta publicació"
 cantReRenote: "No es pot impulsar l'impuls."
 quote: "Cita"
+inChannelRenote: "Renotar només al Canal"
+inChannelQuote: "Citar només al Canal"
 pinnedNote: "Nota fixada"
 pinned: "Fixar al perfil"
 you: "Tu"
@@ -127,6 +130,8 @@ unmarkAsSensitive: "Deixar de marcar com a sensible"
 enterFileName: "Defineix nom del fitxer"
 mute: "Silencia"
 unmute: "Deixa de silenciar"
+renoteMute: "Silenciar Renotes"
+renoteUnmute: "Treure el silenci de les renotes"
 block: "Bloqueja"
 unblock: "Desbloqueja"
 suspend: "Suspèn"
@@ -136,6 +141,8 @@ unblockConfirm: "Vols desbloquejar-lo?"
 suspendConfirm: "Estàs segur que vols suspendre aquest compte?"
 unsuspendConfirm: "Estàs segur que vols treure la suspensió d'aquest compte?"
 selectList: "Tria una llista"
+editList: "Editar llista"
+selectChannel: "Selecciona un canal"
 selectAntenna: "Tria una antena"
 editAntenna: "Modificar antena"
 selectWidget: "Triar un giny"

locales/cs-CZ.yml

@@ -1096,6 +1096,7 @@ iHaveReadXCarefullyAndAgree: "Přečetl jsem si text \"{x}\" a souhlasím s ním
 icon: "Avatar"
 replies: "Odpovědět"
 renotes: "Přeposlat"
+flip: "Otočit"
 _initialAccountSetting:
   accountCreated: "Váš účet byl úspěšně vytvořen!"
   letsStartAccountSetup: "Pro začátek si nastavte svůj profil."
@@ -1108,7 +1109,6 @@ _initialAccountSetting:
   pushNotificationDescription: "Povolení push oznámení vám umožní přijímat oznámení od {name} přímo ve vašem zařízení."
   initialAccountSettingCompleted: "Nastavení profilu dokončeno!"
   haveFun: "Užívejte {name}!"
-  ifYouNeedLearnMore: "Pokud se chcete dozvědět více o tom, jak používat {name} (Misskey), navštivte {link}."
   skipAreYouSure: "Opravdu chcete přeskočit nastavení profilu?"
   laterAreYouSure: "Opravdu chcete provést nastavení profilu později?"
 _serverRules:
@@ -1657,16 +1657,6 @@ _time:
   minute: "Minut"
   hour: "Hodin"
   day: "Dnů"
-_timelineTutorial:
-  title: "Jak používat Misskey"
-  step1_1: "Toto je \"časová osa\". Zde se chronologicky zobrazují všechny \"poznámky\" odeslané na {name}."
-  step1_2: "Existuje několik různých časových plánů. Například \"Domácí časová osa\" bude obsahovat poznámky uživatelů, které sledujete, a \"Místní časová osa\" bude obsahovat poznámky všech uživatelů {name}."
-  step2_1: "Zkusme zveřejnit poznámku. Můžete tak učinit stisknutím tlačítka s ikonou tužky."
-  step2_2: "Co takhle napsat sebepředstavení, nebo jen \"Ahoj {name}!\", pokud se vám nechce?"
-  step3_1: "Dokončil jsi svou první poznámku?"
-  step3_2: "Na časové ose by se nyní měla zobrazit vaše první poznámka."
-  step4_1: "K poznámkám můžete také připojit \"Reakce\"."
-  step4_2: "Chcete-li připojit reakci, stiskněte na poznámce znaménko \"+\" a vyberte emoji, kterým chcete reagovat."
 _2fa:
   alreadyRegistered: "Již jste zaregistrovali dvoufaktorové ověřovací zařízení."
   registerTOTP: "Registrovat aplikaci autentizátoru"

locales/de-DE.yml

@@ -195,6 +195,7 @@ perHour: "Pro Stunde"
 perDay: "Pro Tag"
 stopActivityDelivery: "Senden von Aktivitäten einstellen"
 blockThisInstance: "Diese Instanz blockieren"
+silenceThisInstance: "Instanz stummschalten"
 operations: "Aktionen"
 software: "Software"
 version: "Version"
@@ -214,6 +215,8 @@ clearCachedFiles: "Cache leeren"
 clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen wirklich gelöscht werden?"
 blockedInstances: "Blockierte Instanzen"
 blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert werden sollen, durch Zeilenumbrüche getrennt an. Blockierte Instanzen können mit dieser instanz nicht mehr kommunizieren."
+silencedInstances: "Stummgeschaltete Instanzen"
+silencedInstancesDescription: "Gib die Hostnamen der Instanzen, welche stummgeschaltet werden sollen, durch Zeilenumbrüche getrennt an. Alle Konten dieser Instanzen werden als stummgeschaltet behandelt, können nur noch Follow-Anfragen stellen und wenn nicht gefolgt keine lokalen Konten erwähnen. Blockierte Instanzen sind davon nicht betroffen."
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
@@ -531,6 +534,7 @@ serverLogs: "Serverprotokolle"
 deleteAll: "Alle löschen"
 showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen"
 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"
 sounds: "Töne"
 sound: "Töne"
@@ -794,7 +798,7 @@ active: "Aktiv"
 offline: "Offline"
 notRecommended: "Nicht empfohlen"
 botProtection: "Schutz vor Bots"
-instanceBlocking: "Blockierte Instanzen"
+instanceBlocking: "Blockierte/Stummgeschaltete Instanzen"
 selectAccount: "Benutzerkonto auswählen"
 switchAccount: "Konto wechseln"
 enabled: "Aktiviert"
@@ -975,6 +979,7 @@ assign: "Zuweisen"
 unassign: "Entfernen"
 color: "Farbe"
 manageCustomEmojis: "Kann benutzerdefinierte Emojis verwalten"
+manageAvatarDecorations: "Profilbilddekorationen verwalten"
 youCannotCreateAnymore: "Du hast das Erstellungslimit erreicht."
 cannotPerformTemporary: "Vorübergehend nicht verfügbar"
 cannotPerformTemporaryDescription: "Diese Aktion ist wegen des Überschreitenes des Ausführungslimits temporär nicht verfügbar. Bitte versuche es nach einiger Zeit erneut."
@@ -1128,6 +1133,10 @@ mutualFollow: "Gegenseitig gefolgt"
 fileAttachedOnly: "Nur Notizen mit Dateien"
 showRepliesToOthersInTimeline: "Antworten in Chronik anzeigen"
 hideRepliesToOthersInTimeline: "Antworten nicht in Chronik anzeigen"
+showRepliesToOthersInTimelineAll: "Antworten von allen momentan gefolgten Benutzern in Chronik anzeigen"
+hideRepliesToOthersInTimelineAll: "Antworten von allen momentan gefolgten Benutzern nicht in Chronik anzeigen"
+confirmShowRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern in der Chronik anzeigen?"
+confirmHideRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern nicht in der Chronik anzeigen?"
 externalServices: "Externe Dienste"
 impressum: "Impressum"
 impressumUrl: "Impressums-URL"
@@ -1135,6 +1144,18 @@ impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung,
 privacyPolicy: "Datenschutzerklärung"
 privacyPolicyUrl: "Datenschutzerklärungs-URL"
 tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung"
+avatarDecorations: "Profilbilddekoration"
+attach: "Anbringen"
+detach: "Entfernen"
+angle: "Winkel"
+flip: "Umdrehen"
+showAvatarDecorations: "Profilbilddekoration anzeigen"
+releaseToRefresh: "Zum Aktualisieren loslassen"
+refreshing: "Wird aktualisiert..."
+pullDownToRefresh: "Zum Aktualisieren ziehen"
+disableStreamingTimeline: "Echtzeitaktualisierung der Chronik deaktivieren"
+useGroupedNotifications: "Benachrichtigungen gruppieren"
+cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Beschreibung gegeben werden."
 _announcement:
   forExistingUsers: "Nur für existierende Nutzer"
   forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt."
@@ -1156,7 +1177,6 @@ _initialAccountSetting:
   pushNotificationDescription: "Durch die Aktivierung von Push-Benachrichtigungen kannst du von {name} Benachrichtigungen direkt auf dein Gerät erhalten."
   initialAccountSettingCompleted: "Kontoeinrichtung abgeschlossen!"
   haveFun: "Viel Spaß mit {name}!"
-  ifYouNeedLearnMore: "Besuche {link}, falls du mehr über {name} (Misskey) lernen möchtest."
   skipAreYouSure: "Die Kontoeinrichtung wirklich überspringen?"
   laterAreYouSure: "Die Kontoeinrichtung wirklich später erledigen?"
 _serverRules:
@@ -1170,6 +1190,7 @@ _serverSettings:
   manifestJsonOverride: "Überschreiben von manifest.json"
   shortName: "Abkürzung"
   shortNameDescription: "Ein Kürzel für den Namen der Instanz, der angezeigt werden kann, falls der volle Instanzname lang ist."
+  fanoutTimelineDescription: "Ist diese Option aktiviert, kann eine erhebliche Verbesserung im Abrufen von Chroniken und eine Reduzierung der Datenbankbelastung erzielt werden, im Gegenzug zu einer Steigerung in der Speichernutzung von Redis. Bei geringem Serverspeicher oder Serverinstabilität kann diese Option deaktiviert werden."
 _accountMigration:
   moveFrom: "Von einem anderen Konto zu diesem migrieren"
   moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1470,6 +1491,7 @@ _role:
     inviteLimitCycle: "Zyklus des Einladungslimits"
     inviteExpirationTime: "Gültigkeitsdauer von Einladungen"
     canManageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
+    canManageAvatarDecorations: "Profilbilddekorationen verwalten"
     driveCapacity: "Drive-Kapazität"
     alwaysMarkNsfw: "Dateien immer als NSFW markieren"
     pinMax: "Maximale Anzahl an angehefteten Notizen"
@@ -1589,6 +1611,7 @@ _aboutMisskey:
   donate: "An Misskey spenden"
   morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
   patrons: "UnterstützerInnen"
+  projectMembers: "Projektmitglieder"
 _displayOfSensitiveMedia:
   respect: "Sensible Medien verbergen"
   ignore: "Sensible Medien anzeigen"
@@ -1720,16 +1743,6 @@ _time:
   minute: "Minute(n)"
   hour: "Stunde(n)"
   day: "Tag(en)"
-_timelineTutorial:
-  title: "Wie du Misskey verwendest"
-  step1_1: "Dieser Bildschirm ist die \"Chronik\". Hier werden alle \"Notizen\" von {name} angezeigt."
-  step1_2: "Es gibt einige verschiedene Chroniken. Beispielsweise werden in der \"Startseite\" alle Notizen von Nutzern, denen du folgst, angezeigt, und in der \"Lokalen Chronik\" werden Notizen aller Nutzer auf {name} angezeigt."
-  step2_1: "Lass uns als nächstes versuchen, eine Notiz zu schreiben. Dies kannst du tun, indem du auf den Knopf mit dem Stift-Icon drückst."
-  step2_2: "Stell dich den anderen vor oder schreibe einfach \"Hallo {name}!\", wenn du darauf keine Lust hast oder dir nichts einfällt."
-  step3_1: "Fertig mit dem Senden deiner ersten Notiz?"
-  step3_2: "Falls deine Notiz nun in deiner Chronik auftaucht, hast du alles richtig gemacht."
-  step4_1: "Notizen können zusätzlich mit \"Reaktionen\" ausgestattet werden."
-  step4_2: "Um eine Reaktion anzufügen, klicke auf das „+“-Symbol einer Notiz und wähle ein Emoji aus, mit dem du reagieren möchtest."
 _2fa:
   alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert."
   registerTOTP: "Authentifizierungs-App registrieren"
@@ -1921,6 +1934,7 @@ _exportOrImport:
   userLists: "Listen"
   excludeMutingUsers: "Stummgeschaltete Benutzer aussortieren"
   excludeInactiveUsers: "Inaktive Benutzer aussortieren"
+  withReplies: "Antworten von importierten Benutzern in der Chronik beinhalten"
 _charts:
   federation: "Föderation"
   apRequest: "Anfragen"
@@ -2038,6 +2052,9 @@ _notification:
   checkNotificationBehavior: "Aussehen von Benachrichtigungen überprüfen"
   sendTestNotification: "Testbenachrichtigung senden"
   notificationWillBeDisplayedLikeThis: "Benachrichtigungen sehen so aus"
+  reactedBySomeUsers: "{n} Benutzer haben eine Reaktion geschickt"
+  renotedBySomeUsers: "Renote von {n} Benutzern"
+  followedBySomeUsers: "Von {n} Benutzern gefolgt"
   _types:
     all: "Alle"
     note: "Neue Notizen"
@@ -2141,6 +2158,9 @@ _moderationLogTypes:
   createAd: "Werbung erstellt"
   deleteAd: "Werbung gelöscht"
   updateAd: "Werbung aktualisiert"
+  createAvatarDecoration: "Profilbilddekoration erstellt"
+  updateAvatarDecoration: "Profilbilddekoration aktualisiert"
+  deleteAvatarDecoration: "Profilbilddekoration gelöscht"
 _fileViewer:
   title: "Dateiinformationen"
   type: "Dateityp"
@@ -2149,3 +2169,44 @@ _fileViewer:
   uploadedAt: "Hochgeladen am"
   attachedNotes: "Zugehörige Notizen"
   thisPageCanBeSeenFromTheAuthor: "Nur der Benutzer, der diese Datei hochgeladen hat, kann diese Seite sehen."
+_externalResourceInstaller:
+  title: "Von externer Seite installieren"
+  checkVendorBeforeInstall: "Überprüfe vor Installation die Vertrauenswürdigkeit des Vertreibers."
+  _plugin:
+    title: "Möchtest du dieses Plugin installieren?"
+    metaTitle: "Plugininformation"
+  _theme:
+    title: "Möchten du dieses Farbschema installieren?"
+    metaTitle: "Farbschemainfo"
+  _meta:
+    base: "Farbschemavorlage"
+  _vendorInfo:
+    title: "Vertreiber"
+    endpoint: "Referenzierter Endpunkt"
+    hashVerify: "Hash-Verifikation"
+  _errors:
+    _invalidParams:
+      title: "Ungültige Parameter"
+      description: "Es fehlen Informationen zum Laden der externen Ressource. Überprüfe die übergebene URL."
+    _resourceTypeNotSupported:
+      title: "Diese Ressource wird nicht unterstützt"
+      description: "Dieser Ressourcentyp wird nicht unterstützt. Bitte kontaktiere den Seitenbesitzer."
+    _failedToFetch:
+      title: "Fehler beim Abrufen der Daten"
+      fetchErrorDescription: "Während der Kommunikation mit der externen Seite ist ein Fehler aufgetreten. Kontaktiere den Seitenbesitzer, falls ein erneutes Probieren dieses Problem nicht löst."
+      parseErrorDescription: "Während dem Auslesen der externen Daten ist ein Fehler aufgetreten. Kontaktiere den Seitenbesitzer."
+    _hashUnmatched:
+      title: "Datenverifizierung fehlgeschlagen"
+      description: "Die Integritätsprüfung der geladenen Daten ist fehlgeschlagen. Aus Sicherheitsgründen kann die Installation nicht fortgesetzt werden. Kontaktiere den Seitenbesitzer."
+    _pluginParseFailed:
+      title: "AiScript-Fehler"
+      description: "Die angeforderten Daten wurden erfolgreich abgerufen, jedoch trat während des AiScript-Parsings ein Fehler auf. Kontaktiere den Autor des Plugins. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+    _pluginInstallFailed:
+      title: "Das Plugin konnte nicht installiert werden"
+      description: "Während der Installation des Plugin ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+    _themeParseFailed:
+      title: "Parsing des Farbschemas fehlgeschlagen"
+      description: "Die angeforderten Daten wurden erfolgreich abgerufen, jedoch trat während des Farbschema-Parsings ein Fehler auf. Kontaktiere den Autor des Farbschemas. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+    _themeInstallFailed:
+      title: "Das Farbschema konnte nicht installiert werden"
+      description: "Während der Installation des Farbschemas ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."

locales/en-US.yml

@@ -214,14 +214,9 @@ clearQueueConfirmText: "Any undelivered notes remaining in the queue will not be
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
-silencedInstances: "Silenced Instances"
-silencedInstancesDescription: "List the hostnames of the instances that you want to\
-  \ silence. Accounts in the listed instances are treated as \"Silenced\", can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked instances."
-hiddenTags: "Hidden Hashtags"
-hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish\
-  \ to hide from trending and explore. Hidden hashtags are still discoverable via\
-  \ other means. Blocked instances are not affected even if listed here."
-blockedInstancesDescription: "List the hostnames of the instances that you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
+blockedInstancesDescription: "List the hostnames of the instances you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
+silencedInstances: "Silenced instances"
+silencedInstancesDescription: "List the hostnames of the instances that you want to silence. All accounts of the listed instances will be treated as silenced, can only make follow requests, and cannot mention local accounts if not followed. This will not affect blocked instances."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -539,6 +534,7 @@ serverLogs: "Server logs"
 deleteAll: "Delete all"
 showFixedPostForm: "Display the posting form at the top of the timeline"
 showFixedPostFormInChannel: "Display the posting form at the top of the timeline (Channels)"
+withRepliesByDefaultForNewlyFollowed: "Include replies by newly followed users in the timeline by default"
 newNoteRecived: "There are new notes"
 sounds: "Sounds"
 sound: "Sounds"
@@ -568,6 +564,10 @@ output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
 updateRemoteUser: "Update remote user information"
+unsetUserAvatar: "Delete user icon"
+unsetUserAvatarConfirm: "Are you sure that you want to delete this user's icon?"
+unsetUserBanner: "Delete user banner"
+unsetUserBannerConfirm: "Are you sure that you want to delete this user's banner?"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
 removeAllFollowing: "Unfollow all followed users"
@@ -597,7 +597,7 @@ poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
 disablePlayer: "Close video player"
-expandTweet: "Expand tweet"
+expandTweet: "Expand post"
 themeEditor: "Theme editor"
 description: "Description"
 describeFile: "Add caption"
@@ -983,6 +983,7 @@ assign: "Assign"
 unassign: "Unassign"
 color: "Color"
 manageCustomEmojis: "Manage Custom Emojis"
+manageAvatarDecorations: "Manage avatar decorations"
 youCannotCreateAnymore: "You've hit the creation limit."
 cannotPerformTemporary: "Temporarily unavailable"
 cannotPerformTemporaryDescription: "This action cannot be performed temporarily due to exceeding the execution limit. Please wait for a while and then try again."
@@ -1134,8 +1135,12 @@ edited: "Edited"
 notificationRecieveConfig: "Notification Settings"
 mutualFollow: "Mutual follow"
 fileAttachedOnly: "Only notes with files"
-showRepliesToOthersInTimeline: "Show replies to others in TL"
-hideRepliesToOthersInTimeline: "Hide replies to others from TL"
+showRepliesToOthersInTimeline: "Show replies to others in timeline"
+hideRepliesToOthersInTimeline: "Hide replies to others from timeline"
+showRepliesToOthersInTimelineAll: "Show replies to others from everyone you follow in timeline"
+hideRepliesToOthersInTimelineAll: "Hide replies to others from everyone you follow in timeline"
+confirmShowRepliesAll: "This operation is irreversible. Would you really like to show replies to others from everyone you follow in your timeline?"
+confirmHideRepliesAll: "This operation is irreversible. Would you really like to hide replies to others from everyone you follow in your timeline?"
 externalServices: "External Services"
 impressum: "Impressum"
 impressumUrl: "Impressum URL"
@@ -1143,6 +1148,20 @@ impressumDescription: "In some countries, like germany, the inclusion of operato
 privacyPolicy: "Privacy Policy"
 privacyPolicyUrl: "Privacy Policy URL"
 tosAndPrivacyPolicy: "Terms of Service and Privacy Policy"
+avatarDecorations: "Avatar decorations"
+attach: "Attach"
+detach: "Remove"
+angle: "Angle"
+flip: "Flip"
+showAvatarDecorations: "Show avatar decorations"
+releaseToRefresh: "Release to refresh"
+refreshing: "Refreshing..."
+pullDownToRefresh: "Pull down to refresh"
+disableStreamingTimeline: "Disable real-time timeline updates"
+useGroupedNotifications: "Display grouped notifications"
+signupPendingError: "There was a problem verifying the email address. The link may have expired."
+cwNotationRequired: "If \"Hide content\" is enabled, a description must be provided."
+doReaction: "Add reaction"
 _announcement:
   forExistingUsers: "Existing users only"
   forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
@@ -1152,6 +1171,10 @@ _announcement:
   tooManyActiveAnnouncementDescription: "Having too many active announcements may worsen the user experience. Please consider archiving announcements that have become obsolete."
   readConfirmTitle: "Mark as read?"
   readConfirmText: "This will mark the contents of \"{title}\" as read."
+  shouldNotBeUsedToPresentPermanentInfo: "As it may significantly impact the user experience for new users, it is recommended to use notifications in the flow information rather than stock information."
+  dialogAnnouncementUxWarn: "Having two or more dialog-style notifications simultaneously can significantly impact the user experience, so please use them carefully."
+  silence: "No notification"
+  silenceDescription: "Turning this on will skip the notification of this announcement and the user won't need to read it."
 _initialAccountSetting:
   accountCreated: "Your account was successfully created!"
   letsStartAccountSetup: "For starters, let's set up your profile."
@@ -1164,9 +1187,77 @@ _initialAccountSetting:
   pushNotificationDescription: "Enabling push notifications will allow you to receive notifications from {name} directly on your device."
   initialAccountSettingCompleted: "Profile setup complete!"
   haveFun: "Enjoy {name}!"
-  ifYouNeedLearnMore: "If you'd like to learn more about how to use {name} (Misskey), please visit {link}."
+  youCanContinueTutorial: "You can proceed to a tutorial on how to use {name} (Misskey) or you can exit the setup here and start using it immediately."
+  startTutorial: "Start Tutorial"
   skipAreYouSure: "Really skip profile setup?"
   laterAreYouSure: "Really do profile setup later?"
+_initialTutorial:
+  launchTutorial: "Start Tutorial"
+  title: "Tutorial"
+  wellDone: "Well done!"
+  skipAreYouSure: "Quit Tutorial?"
+  _landing:
+    title: "Welcome to the Tutorial"
+    description: "Here, you can learn the basics of using Misskey and its features."
+  _note:
+    title: "What is a Note?"
+    description: "Posts on Misskey are called 'Notes.' Notes are arranged chronologically on the timeline and are updated in real-time."
+    reply: "Click on this button to reply to a message. It's also possible to reply to replies, continuing the conversation like a thread."
+    renote: "You can share that note to your own timeline. You can also quote them with your comments."
+    reaction: "You can add reactions to the Note. More details will be explained on the next page."
+    menu: "You can view Note details, copy links, and perform various other actions."
+  _reaction:
+    title: "What are Reactions?"
+    description: "Notes can be reacted to with various emojis. Reactions allow you to express nuances that may not be conveyed with just a 'like.'"
+    letsTryReacting: "Reactions can be added by clicking the '+' button on the note. Try reacting to this sample note!"
+    reactToContinue: "Add a reaction to proceed."
+    reactNotification: "You'll receive real-time notifications when someone reacts to your note."
+    reactDone: "You can undo a reaction by pressing the '-' button."
+  _timeline:
+    title: "The Concept of Timelines"
+    description1: "Misskey provides multiple timelines based on usage (some may not be available depending on the server's policies)."
+    home: "You can view notes from accounts you follow."
+    local: "You can view notes from all users on this server."
+    social: "Notes from the Home and Local timelines will be displayed."
+    global: "You can view notes from all connected servers."
+    description2: "You can switch between timelines at the top of the screen at any time."
+    description3: "Additionally, there are list timelines and channel timelines. For more details, please refer to {link}."
+  _postNote:
+    title: "Note Posting Settings"
+    description1: "When posting a note on Misskey, various options are available. The posting form looks like this."
+    _visibility:
+      description: "You can limit who can view your note."
+      public: "Your note will be visible for all users."
+      home: "Public only on the Home timeline. People visiting your profile, via followers, and through renotes can see it."
+      followers: "Visible to followers only. Only followers can see it and no one else, and it cannot be renoted by others."
+      direct: "Visible only to specified users, and the recipient will be notified. It can be used as an alternative to direct messaging."
+      doNotSendConfidencialOnDirect1: "Be careful when sending sensitive information!"
+      doNotSendConfidencialOnDirect2: "Administrators of the server can see what you write. Be careful with sensitive information when sending direct notes to users on untrusted servers."
+      localOnly: "Posting with this flag will not federate the note to other servers. Users on other servers will not be able to view these notes directly, regardless of the display settings above."
+    _cw:
+      title: "Content Warning"
+      description: "Instead of the body, the content written in 'comments' field will be displayed. Pressing \"read more\" will reveal the body."
+      _exampleNote:
+        cw: "This will surely make you hungry!"
+        note: "Just had a chocolate-glazed donut 🍩😋"
+      useCases: "This is used when following the server guidelines for necessary notes or for self-restriction of spoiler or sensitive text."
+  _howToMakeAttachmentsSensitive:
+    title: "How to Mark Attachments as Sensitive?"
+    description: "For attachments that are required by server guidelines or that should not be left intact, add a \"sensitive\" flag."
+    tryThisFile: "Try marking the image attached in this form as sensitive!"
+    _exampleNote:
+      note: "Oops, messed up opening the natto lid..."
+    method: "To mark an attachment as sensitive, click the file thumbnail, open the menu, and click \"Mark as Sensitive.\""
+    sensitiveSucceeded: "When attaching files, please set sensitivities in accordance with the server guidelines."
+    doItToContinue: "Mark the attachment file as sensitive to proceed."
+  _done:
+    title: "The tutorial is complete! 🎉"
+    description: "The functions introduced here are just a small part. For a more detailed understanding of using Misskey, please refer to {link}."
+_timelineDescription:
+  home: "In the Home timeline, you can see notes from accounts you follow."
+  local: "In the Local timeline, you can see notes from all users on this server."
+  social: "The Social timeline displays notes from both the Home and Local timelines."
+  global: "In the Global timeline, you can see notes from all connected servers."
 _serverRules:
   description: "A set of rules to be displayed before registration. Setting a summary of the Terms of Service is recommended."
 _serverSettings:
@@ -1178,6 +1269,7 @@ _serverSettings:
   manifestJsonOverride: "manifest.json Override"
   shortName: "Short name"
   shortNameDescription: "A shorthand for the instance's name that can be displayed if the full official name is long."
+  fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -1435,6 +1527,9 @@ _achievements:
     _smashTestNotificationButton:
       title: "Test overflow"
       description: "Trigger the notification test repeatedly within an extremely short time"
+    _tutorialCompleted:
+      title: "Misskey Elementary Course Diploma"
+      description: "Tutorial completed"
 _role:
   new: "New role"
   edit: "Edit role"
@@ -1478,6 +1573,7 @@ _role:
     inviteLimitCycle: "Invite limit cooldown"
     inviteExpirationTime: "Invite expiration interval"
     canManageCustomEmojis: "Can manage custom emojis"
+    canManageAvatarDecorations: "Manage avatar decorations"
     driveCapacity: "Drive capacity"
     alwaysMarkNsfw: "Always mark files as NSFW"
     pinMax: "Maximum number of pinned notes"
@@ -1597,6 +1693,7 @@ _aboutMisskey:
   donate: "Donate to Misskey"
   morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
   patrons: "Patrons"
+  projectMembers: "Project members"
 _displayOfSensitiveMedia:
   respect: "Hide media marked as sensitive"
   ignore: "Display media marked as sensitive"
@@ -1621,6 +1718,7 @@ _channel:
   notesCount: "{n} Notes"
   nameAndDescription: "Name and description"
   nameOnly: "Name only"
+  allowRenoteToExternal: "Allow renote and quote outside the channel"
 _menuDisplay:
   sideFull: "Side"
   sideIcon: "Side (Icons)"
@@ -1728,16 +1826,6 @@ _time:
   minute: "Minute(s)"
   hour: "Hour(s)"
   day: "Day(s)"
-_timelineTutorial:
-  title: "How to use Misskey"
-  step1_1: "This is the \"timeline\". All \"notes\" submitted on {name} will be chronologically displayed here."
-  step1_2: "There are a few different timelines. For example, the \"Home timeline\" will contain notes of users you follow, and the \"Local timeline\" will contain notes from all users of {name}."
-  step2_1: "Let's try posting a note next. You can do so by pressing the button with a pencil icon."
-  step2_2: "How about writing a self-introduction, or just \"Hello {name}!\" if you don't feel like it?"
-  step3_1: "Finished posting your first note?"
-  step3_2: "Your first note should now be displayed on your timeline."
-  step4_1: "You can also attach \"Reactions\" to notes."
-  step4_2: "To attach a reaction, press the \"+\" mark on a note and choose an emoji you'd like to react with."
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
   registerTOTP: "Register authenticator app"
@@ -1746,7 +1834,7 @@ _2fa:
   step2Click: "Clicking on this QR code will allow you to register 2FA to your security key or phone authenticator app."
   step2Uri: "Enter the following URI if you are using a desktop program"
   step3Title: "Enter an authentication code"
-  step3: "Enter the token provided by your app to finish setup."
+  step3: "Enter the authentication code (token) provided by your app to finish setup."
   setupCompleted: "Setup complete"
   step4: "From now on, any future login attempts will ask for such a login token."
   securityKeyNotSupported: "Your browser does not support security keys."
@@ -1929,6 +2017,7 @@ _exportOrImport:
   userLists: "User lists"
   excludeMutingUsers: "Exclude muted users"
   excludeInactiveUsers: "Exclude inactive users"
+  withReplies: "Include replies from imported users in the timeline"
 _charts:
   federation: "Federation"
   apRequest: "Requests"
@@ -2046,6 +2135,9 @@ _notification:
   checkNotificationBehavior: "Check notification appearance"
   sendTestNotification: "Send test notification"
   notificationWillBeDisplayedLikeThis: "Notifications look like this"
+  reactedBySomeUsers: "{n} users reacted"
+  renotedBySomeUsers: "Renote from {n} users"
+  followedBySomeUsers: "Followed by {n} users"
   _types:
     all: "All"
     note: "New notes"
@@ -2081,7 +2173,7 @@ _deck:
   introduction: "Create the perfect interface for you by arranging columns freely!"
   introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
   widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
-  useSimpleUiForNonRootPages: "Use simplified UI to navigated pages"
+  useSimpleUiForNonRootPages: "Use simple UI for navigated pages"
   usedAsMinWidthWhenFlexible: "Minimum width will be used for this when the \"Auto-adjust width\" option is enabled"
   flexible: "Auto-adjust width"
   _columns:
@@ -2149,6 +2241,9 @@ _moderationLogTypes:
   createAd: "Ad created"
   deleteAd: "Ad deleted"
   updateAd: "Ad updated"
+  createAvatarDecoration: "Avatar decoration created"
+  updateAvatarDecoration: "Avatar decoration updated"
+  deleteAvatarDecoration: "Avatar decoration deleted"
 _fileViewer:
   title: "File details"
   type: "File type"
@@ -2157,3 +2252,44 @@ _fileViewer:
   uploadedAt: "Uploaded at"
   attachedNotes: "Attached notes"
   thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file."
+_externalResourceInstaller:
+  title: "Install from external site"
+  checkVendorBeforeInstall: "Make sure the distributor of this resource is trustworthy before installation."
+  _plugin:
+    title: "Do you want to install this plugin?"
+    metaTitle: "Plugin information"
+  _theme:
+    title: "Do you want to install this theme?"
+    metaTitle: "Theme information"
+  _meta:
+    base: "Base color scheme"
+  _vendorInfo:
+    title: "Distributor information"
+    endpoint: "Referenced endpoint"
+    hashVerify: "Hash verification"
+  _errors:
+    _invalidParams:
+      title: "Invalid parameters"
+      description: "There is not enough information to load data from an external site. Please confirm the entered URL."
+    _resourceTypeNotSupported:
+      title: "This external resource is not supported"
+      description: "The type of this external resource is not supported. Please contact the site administrator."
+    _failedToFetch:
+      title: "Failed to fetch data"
+      fetchErrorDescription: "An error occurred communicating with the external site. If trying again does not fix this issue, please contact the site administrator."
+      parseErrorDescription: "An error occurred processing the data loaded from the external site. Please contact the site administrator."
+    _hashUnmatched:
+      title: "Data verification failed"
+      description: "An error occurred verifying the integrity of the fetched data. As a security measure, installation cannot continue. Please contact the site administrator."
+    _pluginParseFailed:
+      title: "AiScript Error"
+      description: "The requested data was fetched successfully, but an error occurred during AiScript parsing. Please contact the plugin author. Error details can be viewed in the Javascript console."
+    _pluginInstallFailed:
+      title: "Plugin installation failed"
+      description: "A problem occurred during plugin installation. Please try again. Error details can be viewed in the Javascript console."
+    _themeParseFailed:
+      title: "Theme parsing failed"
+      description: "The requested data was fetched successfully, but an error occurred during theme parsing. Please contact the theme author. Error details can be viewed in the Javascript console."
+    _themeInstallFailed:
+      title: "Failed to install theme"
+      description: "A problem occurred during theme installation. Please try again. Error details can be viewed in the Javascript console."

locales/es-ES.yml

@@ -195,6 +195,7 @@ perHour: "por hora"
 perDay: "por día"
 stopActivityDelivery: "Dejar de enviar actividades"
 blockThisInstance: "Bloquear instancia"
+silenceThisInstance: "Silenciar esta instancia"
 operations: "Operaciones"
 software: "Software"
 version: "Versión"
@@ -214,6 +215,8 @@ clearCachedFiles: "Limpiar caché"
 clearCachedFilesConfirm: "¿Desea borrar todos los archivos remotos cacheados?"
 blockedInstances: "Instancias bloqueadas"
 blockedInstancesDescription: "Seleccione los hosts de las instancias que desea bloquear, separadas por una linea nueva. Las instancias bloqueadas no podrán comunicarse con esta instancia."
+silencedInstances: "Instancias silenciadas"
+silencedInstancesDescription: "Listar los hostname de las instancias que quieres silenciar. Todas las cuentas de las instancias listadas serán tratadas como silenciadas, solo podrán hacer peticiones de seguimiento, y no podrán mencionar cuentas locales si no las siguen. Esto no afecta a las instancias bloqueadas."
 muteAndBlock: "Silenciar y bloquear"
 mutedUsers: "Usuarios silenciados"
 blockedUsers: "Usuarios bloqueados"
@@ -531,6 +534,7 @@ serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
 showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
 showFixedPostFormInChannel: "Mostrar el formulario de publicación por encima de la cronología (Canales)"
+withRepliesByDefaultForNewlyFollowed: "Incluir por defecto respuestas de usuarios recién seguidos en la línea de tiempo"
 newNoteRecived: "Tienes una nota nueva"
 sounds: "Sonidos"
 sound: "Sonidos"
@@ -1121,6 +1125,21 @@ unnotifyNotes: "Dejar de notificar nuevas notas"
 authentication: "Autenticación"
 authenticationRequiredToContinue: "Por favor, autentifícate para continuar"
 dateAndTime: "Fecha y hora"
+showRenotes: "Mostrar renotas"
+edited: "Editado"
+notificationRecieveConfig: "Ajustes de Notificaciones"
+mutualFollow: "Os seguís mutuamente"
+fileAttachedOnly: "Solo notas con archivos"
+showRepliesToOthersInTimeline: "Mostrar respuestas a otros en la línea de tiempo"
+hideRepliesToOthersInTimeline: "Ocultar respuestas a otros en la línea de tiempo"
+externalServices: "Servicios Externos"
+impressum: "Impressum"
+impressumUrl: "Impressum URL"
+impressumDescription: "En algunos países, como Alemania, la inclusión del operador de datos (el Impressum) es requerido legalmente para sitios web comerciales."
+privacyPolicy: "Política de Privacidad"
+privacyPolicyUrl: "URL de la Política de Privacidad"
+tosAndPrivacyPolicy: "Condiciones de Uso y Política de Privacidad"
+flip: "Echar de un capirotazo"
 _announcement:
   forExistingUsers: "Solo para usuarios registrados"
   forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán."
@@ -1142,7 +1161,6 @@ _initialAccountSetting:
   pushNotificationDescription: "Habilitar las notificaciones push te permitirá recibir notificaciones de {name} directamente en tu dispositivo."
   initialAccountSettingCompleted: "¡Configuración del perfil completada!"
   haveFun: "¡Disfruta de {name}!"
-  ifYouNeedLearnMore: "Si quieres aprender cómo usar {name} (Misskey), por favor, visita {link}."
   skipAreYouSure: "¿Realmente quieres saltarte la configuración del perfil?"
   laterAreYouSure: "¿Realmente quieres configurar tu perfil después?"
 _serverRules:
@@ -1470,6 +1488,7 @@ _role:
     descriptionOfRateLimitFactor: "Límites más bajos son menos restrictivos, más altos menos restrictivos"
     canHideAds: "Puede ocultar anuncios"
     canSearchNotes: "Uso de la búsqueda de notas"
+    canUseTranslator: "Uso de traductor"
   _condition:
     isLocal: "Usuario local"
     isRemote: "Usuario remoto"
@@ -1518,6 +1537,10 @@ _ad:
   reduceFrequencyOfThisAd: "Mostrar menos este anuncio."
   hide: "No mostrar"
   timezoneinfo: "El día de la semana está determidado por la zona horaria del servidor."
+  adsSettings: "Ajustes de anuncios"
+  notesPerOneAd: "Intervalo de actualización de anuncios en tiempo real (Notas por cada anuncio)"
+  setZeroToDisable: "Establece este valor a 0 para deshabilitar la actualización de anuncios en tiempo real"
+  adsTooClose: "El intervalo de anuncios actual puede empeorar la experiencia del usuario por ser demasiado bajo."
 _forgotPassword:
   enterEmail: "Ingrese el correo usado para registrar la cuenta. Se enviará un link para resetear la contraseña."
   ifNoEmail: "Si no utilizó un correo para crear la cuenta, contáctese con el administrador."
@@ -1701,16 +1724,6 @@ _time:
   minute: "Minutos"
   hour: "Horas"
   day: "Días"
-_timelineTutorial:
-  title: "Cómo usar Misskey"
-  step1_1: "Ésta es la \"línea de tiempo\". Todas las \"notas\" que sean publicadas en {name} serán mostradas cronológicamente aquí."
-  step1_2: "Hay varias líneas de tiempo. Por ejemplo, la línea temporal \"Inicio\" contiene las notas de otros usuarios que sigues, y la línea \"Local\" contandrá las notas de todos los usuarios de  {name}."
-  step2_1: "Ahora probemos publicar una nota. Puedes hacerlo presionando el botón que tiene un ícono de lápiz."
-  step2_2: "¿Qué tal si escribimos una introducción? o sólo un \"¡Hola {name}!\" ¿No te apetece?"
-  step3_1: "¿Terminaste de publicar tu primera nota?"
-  step3_2: "Tu primera nota ahora se mostrará en tu línea de tiempo."
-  step4_1: "También puedes añadir \"Reacciones\" a notas."
-  step4_2: "Para añadir una reacción selecciona el botón \"+\" en la nota y escoge el emoji que quieras para reaccionar."
 _2fa:
   alreadyRegistered: "Ya has completado la configuración."
   registerTOTP: "Registrar aplicación autenticadora"
@@ -1902,6 +1915,7 @@ _exportOrImport:
   userLists: "Listas"
   excludeMutingUsers: "Excluir usuarios silenciados"
   excludeInactiveUsers: "Excluir usuarios inactivos"
+  withReplies: "Incluir respuestas de los usuarios importados en la línea de tiempo"
 _charts:
   federation: "Federación"
   apRequest: "Pedidos"
@@ -2119,3 +2133,14 @@ _moderationLogTypes:
   unmarkSensitiveDriveFile: "Archivo marcado como no sensible"
   resolveAbuseReport: "Reporte resuelto"
   createInvitation: "Generar invitación"
+  createAd: "Anuncio creado"
+  deleteAd: "Anuncio eliminado"
+  updateAd: "Anuncio actualizado"
+_fileViewer:
+  title: "Detalles del archivo"
+  type: "Tipo de archivo"
+  size: "Tamaño del archivo"
+  url: "URL"
+  uploadedAt: "Subido el"
+  attachedNotes: "Notas adjuntas"
+  thisPageCanBeSeenFromTheAuthor: "Esta página solo puede ser vista por el autor."

locales/fr-FR.yml

@@ -184,7 +184,7 @@ selectUser: "Sélectionner un·e utilisateur·rice"
 recipient: "Destinataire"
 annotation: "Commentaires"
 federation: "Fédération"
-instances: "Instance"
+instances: "Instances"
 registeredAt: "Premier contact le"
 latestRequestReceivedAt: "Dernière requête reçue"
 latestStatus: "Dernier statut"
@@ -194,6 +194,7 @@ perHour: "par heure"
 perDay: "par jour"
 stopActivityDelivery: "Arrêter l’envoi de l’activité"
 blockThisInstance: "Bloquer cette instance"
+silenceThisInstance: "Mettre cette instance en sourdine"
 operations: "Opérations"
 software: "Logiciel"
 version: "Version"
@@ -213,6 +214,8 @@ clearCachedFiles: "Vider le cache"
 clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider tout le cache de fichiers distants ?"
 blockedInstances: "Instances bloquées"
 blockedInstancesDescription: "Listez les instances que vous désirez bloquer, une par ligne. Ces instances ne seront plus en capacité d'interagir avec votre instance."
+silencedInstances: "Instances mises en sourdine"
+silencedInstancesDescription: "Énumérer les noms d'hôte des instances à mettre en sourdine. Tous les comptes des instances énumérées seront traités comme mis en sourdine, ne peuvent faire que des demandes de suivi et ne peuvent pas mentionner les comptes locaux s'ils ne sont pas suivis. Cela n'affectera pas les instances bloquées."
 muteAndBlock: "Masqué·e·s / Bloqué·e·s"
 mutedUsers: "Utilisateur·rice·s en sourdine"
 blockedUsers: "Utilisateur·rice·s bloqué·e·s"
@@ -384,7 +387,7 @@ antennaSource: "Source de l’antenne"
 antennaKeywords: "Mots clés à recevoir"
 antennaExcludeKeywords: "Mots clés à exclure"
 antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
-notifyAntenna: "Je souhaite recevoir les notifications des nouvelles notes"
+notifyAntenna: "Me notifier pour les nouvelles notes"
 withFileAntenna: "Notes ayant des attachements uniquement"
 enableServiceworker: "Activer ServiceWorker"
 antennaUsersDescription: "Saisissez un seul nom d’utilisateur·rice par ligne"
@@ -525,6 +528,7 @@ objectStorageSetPublicRead: "Régler sur « public » lors de l'envoi"
 serverLogs: "Journal du serveur"
 deleteAll: "Supprimer tout"
 showFixedPostForm: "Afficher le formulaire de publication en haut du fil d'actualité"
+withRepliesByDefaultForNewlyFollowed: "Afficher les réponses des nouvelles personnes que vous suivez dans le fil par défaut"
 newNoteRecived: "Voir les nouvelles notes"
 sounds: "Sons"
 sound: "Sons"
@@ -607,14 +611,14 @@ permission: "Autorisations "
 enableAll: "Tout activer"
 disableAll: "Tout désactiver"
 tokenRequested: "Autoriser l'accès au compte"
-pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici."
+pluginTokenRequestedDescription: "Cette extension pourra utiliser les autorisations définies ici."
 notificationType: "Type de notifications"
 edit: "Editer"
 emailServer: "Serveur de messagerie"
 enableEmail: "Activer la distribution de courriel"
-emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
+emailConfigInfo: "Utilisé pour confirmer votre adresse e-mail et réinitialiser votre mot de passe en cas d’oubli"
 email: "E-mail "
-emailAddress: "Adresses e-mail"
+emailAddress: "Adresse e-mail"
 smtpConfig: "Paramètres du serveur SMTP"
 smtpHost: "Serveur distant"
 smtpPort: "Port"
@@ -689,7 +693,7 @@ repliesCount: "Nombre de réponses envoyées"
 renotesCount: "Nombre de notes que vous avez renotées"
 repliedCount: "Nombre de réponses reçues"
 renotedCount: "Nombre de vos notes renotées"
-followingCount: "Nombre de comptes suivis"
+followingCount: "Nombre d'abonnements"
 followersCount: "Nombre d'abonnés"
 sentReactionsCount: "Nombre de réactions envoyées"
 receivedReactionsCount: "Nombre de réactions reçues"
@@ -760,7 +764,7 @@ inUse: "utilisé"
 editCode: "Modifier le code"
 apply: "Appliquer"
 receiveAnnouncementFromInstance: "Recevoir les messages d'information de l'instance"
-emailNotification: "Notifications par mail"
+emailNotification: "Notifications par courriel"
 publish: "Public"
 inChannelSearch: "Chercher dans le canal"
 useReactionPickerForContextMenu: "Clic-droit pour ouvrir le panneau de réactions"
@@ -777,7 +781,7 @@ addDescription: "Ajouter une description"
 userPagePinTip: "Vous pouvez afficher des notes ici en sélectionnant l'option « Épingler au profil » dans le menu de chaque note."
 notSpecifiedMentionWarning: "Vous avez mentionné des utilisateur·rice·s qui ne font pas partie de la liste des destinataires"
 info: "Informations"
-userInfo: "Informations sur l'utilisateur"
+userInfo: "Informations sur l'utilisateur·rice"
 unknown: "Inconnu"
 onlineStatus: "Statut"
 hideOnlineStatus: "Se rendre invisible"
@@ -927,6 +931,7 @@ remoteOnly: "Distant uniquement"
 failedToUpload: "Échec du transfert"
 cannotUploadBecauseInappropriate: "Impossible de télécharger le document car il a été déterminé qu'il pouvait contenir un contenu inapproprié."
 cannotUploadBecauseNoFreeSpace: "Impossible de télécharger en raison d'un manque d'espace libre sur le disque.\n"
+cannotUploadBecauseExceedsFileSizeLimit: "Ce fichier ne peut pas être téléchargé parce qu'il dépasse la taille maximale."
 beta: "Bêta"
 enableAutoSensitive: "Détermination automatique de NSFW"
 enableAutoSensitiveDescription: "S'il est disponible, le drapeau NSFW est automatiquement défini sur le média en utilisant l'apprentissage automatique. Même si cette fonction est désactivée, elle peut être réglée automatiquement dans certains cas."
@@ -941,6 +946,7 @@ unsubscribePushNotification: "Désactiver les notifications push"
 pushNotificationAlreadySubscribed: "Les notifications push sont déjà activées"
 pushNotificationNotSupported: "Votre navigateur ou votre instance ne prend pas en charge les notifications push"
 sendPushNotificationReadMessage: "Supprimer les notifications push une fois que les notifications ou messages pertinents ont été lus."
+sendPushNotificationReadMessageCaption: "Cela peut augmenter la consommation de batterie de votre appareil."
 windowMaximize: "Maximiser"
 windowMinimize: "Minimaliser"
 windowRestore: "Restaurer"
@@ -948,12 +954,14 @@ caption: "Libellé"
 loggedInAsBot: "Connecté actuellement en tant que bot"
 tools: "Outils"
 cannotLoad: "Chargement impossible"
+numberOfProfileView: "Nombre de vues du profil"
 like: "J'aime"
 unlike: "Ne plus aimer"
 numberOfLikes: "Favoris"
 show: "Affichage"
 neverShow: "Ne plus afficher"
 remindMeLater: "Peut-être plus tard"
+didYouLikeMisskey: "Avez-vous aimé Misskey ?"
 roles: "Rôles"
 role: "Rôles"
 noRole: "Aucun rôle"
@@ -963,9 +971,15 @@ assign: "Attribuer"
 unassign: "Retirer"
 color: "Couleur"
 manageCustomEmojis: "Gestion des émojis personnalisés"
+manageAvatarDecorations: "Gérer les décorations d'avatar"
+youCannotCreateAnymore: "Vous avez atteint la limite de création."
+cannotPerformTemporary: "Temporairement indisponible"
+invalidParamError: "Paramètres invalides"
+permissionDeniedError: "Opération refusée"
 preset: "Préréglage"
 selectFromPresets: "Sélectionner à partir des préréglages"
 achievements: "Accomplissements"
+gotInvalidResponseError: "Réponse du serveur invalide"
 thisPostMayBeAnnoying: "Cette note peut gêner d'autres personnes."
 thisPostMayBeAnnoyingHome: "Publier vers le fil principal"
 thisPostMayBeAnnoyingCancel: "Annuler"
@@ -973,13 +987,19 @@ thisPostMayBeAnnoyingIgnore: "Publier quand-même"
 collapseRenotes: "Réduire les renotes déjà vues"
 internalServerError: "Erreur interne du serveur"
 copyErrorInfo: "Copier les détails de l’erreur"
+joinThisServer: "S'inscrire à cette instance"
 exploreOtherServers: "Trouver une autre instance"
 disableFederationOk: "Désactiver"
+postToTheChannel: "Publier au canal"
 likeOnly: "Les favoris uniquement"
 sensitiveWords: "Mots sensibles"
 notesSearchNotAvailable: "La recherche de notes n'est pas disponible."
 license: "Licence"
 myClips: "Mes clips"
+retryAllQueuesConfirmText: "Cela peut augmenter temporairement la charge du serveur."
+showClipButtonInNoteFooter: "Ajouter « Clip » au menu d'action de la note"
+reactionsDisplaySize: "Taille de l'affichage des réactions"
+noteIdOrUrl: "Identifiant de la note ou URL"
 video: "Vidéo"
 videos: "Vidéos"
 dataSaver: "Économiseur de données"
@@ -987,6 +1007,7 @@ accountMigration: "Migration de compte"
 accountMoved: "Cet·te utilisateur·rice a migré son compte vers :"
 accountMovedShort: "Ce compte a migré"
 operationForbidden: "Opération non autorisée"
+forceShowAds: "Toujours afficher les publicités"
 addMemo: "Ajouter un mémo"
 reactionsList: "Réactions"
 renotesList: "Liste de renotes"
@@ -995,41 +1016,169 @@ leftTop: "En haut à gauche"
 rightTop: "En haut à droite"
 leftBottom: "En bas à gauche"
 rightBottom: "En bas à droite"
+stackAxis: "Direction d'empilement"
 vertical: "Vertical"
 horizontal: "Latéral"
+position: "Position"
 serverRules: "Règles du serveur"
+pleaseAgreeAllToContinue: "Pour continuer, veuillez accepter tous les champs ci-dessus."
+continue: "Continuer"
+preservedUsernames: "Noms d'utilisateur·rice réservés"
 archive: "Archive"
+thisChannelArchived: "Ce canal a été archivé."
 displayOfNote: "Affichage de la note"
+initialAccountSetting: "Configuration initiale du profil"
 youFollowing: "Abonné·e"
+preventAiLearning: "Refuser l'usage dans l'apprentissage automatique d'IA générative"
+preventAiLearningDescription: "Demander aux robots d'indexation de ne pas utiliser le contenu publié, tel que les notes et les images, dans l'apprentissage automatique d'IA générative. Cela est réalisé en incluant le drapeau « noai » dans la réponse HTML. Une prévention complète n'est toutefois pas possible, car il est au robot d'indexation de respecter cette demande."
 options: "Options"
+specifyUser: "Spécifier l'utilisateur·rice"
+failedToPreviewUrl: "Aperçu d'URL échoué"
+update: "Mettre à jour"
 later: "Plus tard"
 goToMisskey: "Retour vers Misskey"
+installed: "Installé"
 expirationDate: "Date d’expiration"
+waitingForMailAuth: "En attente de la vérification de l'adresse courriel"
 usedAt: "Utilisé le"
 unused: "Non-utilisé"
 used: "Utilisé"
 expired: "Expiré"
 doYouAgree: "Êtes-vous d’accord ?"
+beSureToReadThisAsItIsImportant: "Assurez-vous de le lire ; c'est important."
+dialog: "Dialogue"
 icon: "Avatar"
 forYou: "Pour vous"
+currentAnnouncements: "Annonces actuelles"
+pastAnnouncements: "Annonces passées"
 replies: "Répondre"
 renotes: "Renoter"
 loadReplies: "Inclure les réponses"
+loadConversation: "Afficher la conversation"
 pinnedList: "Liste épinglée"
 notifyNotes: "Notifier à propos des nouvelles notes"
 authentication: "Authentification"
 authenticationRequiredToContinue: "Veuillez vous authentifier pour continuer"
+dateAndTime: "Date et heure"
 showRenotes: "Afficher les renotes"
+edited: "Modifié"
+notificationRecieveConfig: "Paramètres des notifications"
+mutualFollow: "Abonnement mutuel"
+showRepliesToOthersInTimeline: "Afficher les réponses aux autres dans le fil"
+hideRepliesToOthersInTimeline: "Masquer les réponses aux autres dans le fil"
+showRepliesToOthersInTimelineAll: "Afficher les réponses de toutes les personnes que vous suivez dans le fil"
+hideRepliesToOthersInTimelineAll: "Masquer les réponses de toutes les personnes que vous suivez dans le fil"
+confirmShowRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment afficher les réponses de toutes les personnes que vous suivez dans le fil ?"
+confirmHideRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment masquer les réponses de toutes les personnes que vous suivez dans le fil ?"
+externalServices: "Services externes"
+impressum: "Impressum"
+impressumUrl: "URL de l'impressum"
+impressumDescription: "Dans certains pays comme l'Allemagne, il est obligatoire d'afficher les informations sur l'opérateur d'un site (un impressum)."
+privacyPolicy: "Politique de confidentialité"
+privacyPolicyUrl: "URL de la politique de confidentialité"
+tosAndPrivacyPolicy: "Conditions d'utilisation et politique de confidentialité"
+avatarDecorations: "Décorations d'avatar"
+attach: "Mettre"
+detach: "Enlever"
+angle: "Angle"
+flip: "Inverser"
+showAvatarDecorations: "Afficher les décorations d'avatar"
+releaseToRefresh: "Relâcher pour rafraîchir"
+refreshing: "Rafraîchissement..."
+pullDownToRefresh: "Tirer vers le bas pour rafraîchir"
+disableStreamingTimeline: "Désactiver les mises à jour en temps réel de la ligne du temps"
+useGroupedNotifications: "Grouper les notifications"
+signupPendingError: "Un problème est survenu lors de la vérification de votre adresse e-mail. Le lien a peut-être expiré."
+cwNotationRequired: "Si « Masquer le contenu » est activé, une description doit être fournie."
+doReaction: "Réagir"
 _announcement:
   readConfirmTitle: "Marquer comme lu ?"
+  shouldNotBeUsedToPresentPermanentInfo: "Puisque cela pourrait nuire considérablement à l'expérience utilisateur pour les nouveaux utilisateurs, il est recommandé d'utiliser les annonces pour afficher des informations temporaires plutôt que des informations persistantes."
+  dialogAnnouncementUxWarn: "Avoir deux ou plus annonces de style dialogue en même temps pourrait nuire considérablement à l'expérience utilisateur. Veuillez les utiliser avec caution."
+  silence: "Ne pas me notifier"
+  silenceDescription: "Si activée, vous ne recevrez pas de notifications sur les annonces et n'aurez pas besoin de les marquer comme lues."
 _initialAccountSetting:
   profileSetting: "Paramètres du profil"
   privacySetting: "Paramètres de confidentialité"
   initialAccountSettingCompleted: "Configuration du profil terminée avec succès !"
-  ifYouNeedLearnMore: "Si vous voulez en savoir plus comment utiliser {name}(Misskey), veuillez visiter {link}."
-  skipAreYouSure: "Désirez-vous ignorer la configuration du profile ?"
+  youCanContinueTutorial: "Vous pouvez procéder au tutoriel sur l'utilisation de {nom}(Misskey) ou vous arrêter ici et commencer à l'utiliser immédiatement."
+  startTutorial: "Démarrer le tutoriel"
+  skipAreYouSure: "Désirez-vous ignorer la configuration du profil ?"
+_initialTutorial:
+  launchTutorial: "Visionner le tutoriel"
+  title: "Tutoriel"
+  wellDone: "Bien joué !"
+  skipAreYouSure: "Quitter le tutoriel ?"
+  _landing:
+    title: "Bienvenue dans le tutoriel"
+    description: "Ici, vous pouvez apprendre l'utilisation de base de Misskey et ses fonctionnalités."
+  _note:
+    title: "Qu'est-ce que les notes ?"
+    description: "Les messages sur Misskey sont appelés des « notes » . Les notes sont classées par ordre chronologique sur le fil et sont mises à jour en temps réel."
+    reply: "Vous pouvez répondre aux messages. Vous pouvez également répondre aux réponses et poursuivre la conversation comme un fil de discussion."
+    renote: "Vous pouvez partager cette note sur votre propre fil. Vous pouvez aussi ajouter du texte en citant."
+    reaction: "Vous pouvez ajouter des réactions. Les détails sont expliqués à la page suivante."
+    menu: "Vous pouvez afficher les détails de la note, copier le lien et effectuer d'autres actions."
+  _reaction:
+    title: "Qu'est-ce que les réactions ?"
+    description: "Vous pouvez ajouter des « réactions » aux notes. Les réactions vous permettent d'exprimer à l'aise des nuances qui ne peuvent pas être exprimées par des mentions j'aime."
+    letsTryReacting: "Des réactions peuvent être ajoutées en cliquant sur le bouton « + » de la note. Essayez d'ajouter une réaction à cet exemple de note !"
+    reactToContinue: "Ajoutez une réaction pour procéder."
+    reactNotification: "Vous recevez des notifications en temps réel lorsque quelqu'un réagit à votre note."
+    reactDone: "Vous pouvez annuler la réaction en cliquant sur le bouton « - » ."
+  _timeline:
+    title: "Fonctionnement des fils"
+    description1: "Misskey offre plusieurs fils selon l'usage (certains peuvent être désactivés par le serveur)."
+    home: "Vous pouvez voir les notes des utilisateurs auxquels vous êtes abonné·e."
+    local: "Vous pouvez voir les notes de tous les utilisateurs sur cette instance."
+    social: "Les notes des fils principal et local sont affichées."
+    global: "Vous pouvez voir les notes de toutes les instances connectées."
+    description2: "Vous pouvez passer d'un fil à l'autre en haut de l'écran à tout moment."
+    description3: "De plus, il y a les fils des listes et des canaux. Pour plus de détails, consultez {link}."
+  _postNote:
+    title: "Paramètres de la publication de note"
+    description1: "Lorsque vous publiez des notes sur Misskey, diverses options sont disponibles. Voici le formulaire de publication."
+    _visibility:
+      description: "Vous pouvez choisir qui peut voir vos notes."
+      public: "Visible à tous les utilisateurs."
+      home: "Uniquement visible sur le fil principal. Les utilisateurs pourront la voir en visitant ton profil, en s'abonnant à vous et par les renotes."
+      followers: "Uniquement visible à vos abonnés. Elle ne pourra être renotée que par vous-même."
+      direct: "Uniquement visible aux utilisateurs de votre choix. Les récipients seront notifiés. Cette option peut être utilisée comme alternative aux messages directs."
+      doNotSendConfidencialOnDirect1: "Faites attention quand vous envoyez vos informations sensibles !"
+      doNotSendConfidencialOnDirect2: "Les administrateurs de l'instance destinataire peuvent voir toutes les notes publiées. Soyez prudent·e avec vos informations sensibles quand vous envoyez des notes directes aux utilisateurs dont vous ne vous fiez pas aux instances."
+      localOnly: "Désactiver la fédération de la note aux autres instances. Les utilisateurs des autres instances ne pourront pas voir directement la note quelle que soit l'étendue de la publication mentionnée ci-dessus."
+    _cw:
+      title: "Masquer le contenu (CW)"
+      description: "Au lieu du corps du texte, le contenu du champ « commentaires » s'affichera. Appuyez sur « afficher le contenu » pour voir le corps du texte."
+      _exampleNote:
+        cw: "Attention : cela vous donnera faim !"
+        note: "J'ai mangé un beignet enrobé de chocolat 🍩😋"
+      useCases: "Utilisé pour désigner certaines notes selon les règles du serveur ou pour cacher des spoilers ou des textes sensibles."
+  _howToMakeAttachmentsSensitive:
+    title: "Comment marquer un fichier joint comme sensible ?"
+    description: "Attachez un drapeau « sensible » aux fichiers joints selon les règles du serveur ou si vous ne voulez pas que le fichier soit vu directement."
+    tryThisFile: "Essayez de marquer l'image jointe à ce formulaire de publication comme sensible !"
+    _exampleNote:
+      note: "Oups, j'ai échoué à ouvrir le couvercle du natto..."
+    method: "Pour marquer un fichier joint comme sensible, cliquez sur la vignette du fichier, ouvrez le menu et cliquez sur « marquer comme sensible » ."
+    sensitiveSucceeded: "Quand vous joignez des fichiers, veuillez indiquer la sensibilité selon les règles du serveur."
+    doItToContinue: "Marquez le fichier joint comme sensible pour procéder."
+  _done:
+    title: "Le tutoriel est terminé ! 🎉"
+    description: "Les fonctionnalités introduites ici ne sont que quelques-unes. Pour savoir plus sur l'utilisation de Misskey, veuillez consulter {lien}."
+_timelineDescription:
+  home: "Sur le fil principal, vous pouvez voir les notes des utilisateurs auxquels vous êtes abonné·e."
+  local: "Sur le fil local, vous pouvez voir les notes de tous les utilisateurs sur cette instance."
+  social: "Sur le fil social, les notes des fils principal et local sont affichées."
+  global: "Sur le fil global, vous pouvez voir les notes de toutes les instances connectées."
 _serverSettings:
   iconUrl: "URL de l’icône"
+  appIconResolutionMustBe: "La résolution doit être au moins {resolution}."
+  shortName: "Nom court"
+  shortNameDescription: "Si le nom officiel de l'instance est long, cette abréviation peut être affichée à la place."
+  fanoutTimelineDescription: "Si activée, la performance de la récupération de la chronologie augmentera considérablement et la charge sur la base de données sera réduite. En revanche, l'utilisation de la mémoire de Redis augmentera. Considérez désactiver cette option si le serveur est bas en mémoire ou instable."
+  fanoutTimelineDbFallback: "Recours à la base de données"
+  fanoutTimelineDbFallbackDescription: "Si activée, une demande supplémentaire à la base de données est effectuée comme solution de rechange quand le fil n'est pas mis en cache. Si désactivée, la demande à la base de données n'est pas effectuée, ce qui réduit davantage la charge du serveur mais limite l'étendue du fil récupérable."
 _accountMigration:
   moveFrom: "Migrer un autre compte vers le présent compte"
   moveFromSub: "Créer un alias vers un autre compte"
@@ -1096,9 +1245,16 @@ _achievements:
       description: "Rendre votre compte comme un chat"
       flavor: "Je n'ai pas encore de nom"
     _following1:
-      title: "Vous suivez votre premier utilisateur·rice"
+      title: "Vous suivez votre premier·ère utilisateur·rice"
+    _following10:
+      description: "S'abonner à plus de 10 utilisateur·rice·s"
     _following50:
       title: "Beaucoup d'amis"
+      description: "S'abonner à plus de 50 utilisateur·rice·s"
+    _following100:
+      description: "S'abonner à plus de 100 utilisateur·rice·s"
+    _following300:
+      description: "S'abonner à plus de 300 utilisateur·rice·s"
     _followers10:
       title: "Abonnez-moi !"
       description: "Obtenir plus de 10 abonné·e·s"
@@ -1133,7 +1289,7 @@ _achievements:
     _viewInstanceChart:
       title: "Analyste"
     _outputHelloWorldOnScratchpad:
-      title: "Bonjour tout le monde !"
+      title: "Hello, world!"
     _open3windows:
       title: "Multi-fenêtres"
     _driveFolderCircularReference:
@@ -1155,6 +1311,12 @@ _achievements:
       flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
     _brainDiver:
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "Débordement de tests"
+      description: "Détruire le bouton de test de notifications dans un intervalle extrêmement court"
+    _tutorialCompleted:
+      title: "Diplôme de la course élémentaire de Misskey"
+      description: "Terminer le tutoriel"
 _role:
   new: "Nouveau rôle"
   edit: "Modifier le rôle"
@@ -1178,7 +1340,9 @@ _role:
     high: "Haute"
   _options:
     canManageCustomEmojis: "Gestion des émojis personnalisés"
+    canManageAvatarDecorations: "Gestion des décorations d'avatar"
     wordMuteMax: "Nombre maximal de caractères dans le filtre de mots"
+    canUseTranslator: "Usage de la fonctionnalité de traduction"
 _sensitiveMediaDetection:
   description: "L'apprentissage automatique peut être utilisé pour détecter automatiquement les médias sensibles à modérer. La sollicitation des serveurs augmente légèrement."
   sensitivity: "Sensibilité de la détection"
@@ -1212,6 +1376,10 @@ _ad:
   back: "Retour"
   reduceFrequencyOfThisAd: "Voir cette publicité moins souvent"
   hide: "Cacher "
+  adsSettings: "Paramètres des publicités"
+  notesPerOneAd: "Intervalle de diffusion de publicités lors de la mise à jour en temps réel (nombre de notes par publicité)"
+  setZeroToDisable: "Mettre cette valeur à 0 pour désactiver la diffusion de publicités lors de la mise à jour en temps réel"
+  adsTooClose: "L'expérience utilisateur peut être gravement compromise par un intervalle de diffusion de publicités extrêmement court."
 _forgotPassword:
   enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte. Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette adresse."
   ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice de votre instance."
@@ -1227,9 +1395,9 @@ _email:
   _receiveFollowRequest:
     title: "Vous avez reçu une demande de suivi"
 _plugin:
-  install: "Installation de plugin"
+  install: "Installation d'extensions"
   installWarn: "N’installez que des extensions provenant de sources de confiance."
-  manage: "Gestion des plugins"
+  manage: "Gestion des extensions"
   viewSource: "Afficher la source"
 _preferencesBackups:
   list: "Sauvegardes créées"
@@ -1264,6 +1432,7 @@ _aboutMisskey:
   donate: "Soutenir Misskey"
   morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
   patrons: "Contributeurs"
+  projectMembers: "Membres du projet"
 _displayOfSensitiveMedia:
   force: "Masquer tous les médias"
 _instanceTicker:
@@ -1286,6 +1455,7 @@ _channel:
   notesCount: "{n} Notes"
   nameAndDescription: "Nom et description"
   nameOnly: "Nom seulement"
+  allowRenoteToExternal: "Permettre la renote et la citation hors du canal"
 _menuDisplay:
   sideFull: "Latéral"
   sideIcon: "Latéral (icônes)"
@@ -1393,9 +1563,6 @@ _time:
   minute: "min"
   hour: "h"
   day: "j"
-_timelineTutorial:
-  title: "Comment utiliser Misskey"
-  step3_1: "Avez-vous publié votre première note ?"
 _2fa:
   alreadyRegistered: "Configuration déjà achevée."
   step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
@@ -1494,7 +1661,7 @@ _widgets:
     chooseList: "Sélectionner une liste"
 _cw:
   hide: "Masquer"
-  show: "Afficher plus …"
+  show: "Afficher le contenu"
   chars: "{count} caractères"
   files: "{count} fichiers"
 _poll:
@@ -1531,7 +1698,7 @@ _visibility:
 _postForm:
   replyPlaceholder: "Répondre à cette note ..."
   quotePlaceholder: "Citez cette note ..."
-  channelPlaceholder: "Publier vers le canal"
+  channelPlaceholder: "Publier au canal…"
   _placeholders:
     a: "Quoi de neuf ?"
     b: "Il s'est passé quelque chose ?"
@@ -1559,6 +1726,7 @@ _exportOrImport:
   userLists: "Listes"
   excludeMutingUsers: "Exclure les utilisateur·rice·s mis en sourdine"
   excludeInactiveUsers: "Exclure les utilisateur·rice·s inactifs"
+  withReplies: "Inclure les réponses des utilisateur·rice·s importé·e·s dans le fil"
 _charts:
   federation: "Fédération"
   apRequest: "Requêtes"
@@ -1655,13 +1823,17 @@ _notification:
   youGotReply: "Réponse de {name}"
   youGotQuote: "Cité·e par {name}"
   youRenoted: "{name} vous a Renoté"
-  youWereFollowed: "Vous suit"
+  youWereFollowed: "s'est abonné·e à vous"
   youReceivedFollowRequest: "Vous avez reçu une demande d’abonnement"
   yourFollowRequestAccepted: "Votre demande d’abonnement a été accepté"
   pollEnded: "Les résultats du sondage sont disponibles"
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Les notifications push ont été mises à jour"
   achievementEarned: "Accomplissement"
+  testNotification: "Tester la notification"
+  reactedBySomeUsers: "{n} utilisateur·rice·s ont réagi"
+  renotedBySomeUsers: "{n} utilisateur·rice·s ont renoté"
+  followedBySomeUsers: "{n} utilisateur·rice·s se sont abonné·e·s à vous"
   _types:
     all: "Toutes"
     follow: "Nouvel·le abonné·e"
@@ -1703,12 +1875,92 @@ _deck:
     tl: "Fil"
     antenna: "Antennes"
     list: "Listes"
-    channel: "Canaux"
+    channel: "Canal"
     mentions: "Mentions"
     direct: "Direct"
 _webhookSettings:
   name: "Nom"
   active: "Activé"
 _moderationLogTypes:
-  suspend: "Suspendre"
-  resetPassword: "Réinitialiser le mot de passe"
+  createRole: "Rôle créé"
+  deleteRole: "Rôle supprimé"
+  updateRole: "Rôle mis à jour"
+  assignRole: "Rôle attribué"
+  unassignRole: "Rôle enlevé"
+  suspend: "Utilisateur suspendu"
+  unsuspend: "Suspension d'un utilisateur levée"
+  addCustomEmoji: "Émoji personnalisé ajouté"
+  updateCustomEmoji: "Émoji personnalisé mis à jour"
+  deleteCustomEmoji: "Émoji personnalisé supprimé"
+  updateServerSettings: "Paramètres du serveur mis à jour"
+  updateUserNote: "Note de modération mise à jour"
+  deleteDriveFile: "Fichier supprimé"
+  deleteNote: "Note supprimée"
+  createGlobalAnnouncement: "Annonce globale créée"
+  createUserAnnouncement: "Annonce individuelle créée"
+  updateGlobalAnnouncement: "Annonce globale mise à jour"
+  updateUserAnnouncement: "Annonce individuelle mise à jour"
+  deleteGlobalAnnouncement: "Annonce globale supprimée"
+  deleteUserAnnouncement: "Annonce individuelle supprimée"
+  resetPassword: "Mot de passe réinitialisé"
+  suspendRemoteInstance: "Instance distante suspendue"
+  unsuspendRemoteInstance: "Suspension d'une instance distante levée"
+  markSensitiveDriveFile: "Fichier marqué comme sensible"
+  unmarkSensitiveDriveFile: "Marquage du fichier comme sensible enlevé"
+  resolveAbuseReport: "Signalement résolu"
+  createInvitation: "Code d'invitation créé"
+  createAd: "Publicité créée"
+  deleteAd: "Publicité supprimée"
+  updateAd: "Publicité mise à jour"
+  createAvatarDecoration: "Décoration d'avatar créée"
+  updateAvatarDecoration: "Décoration d'avatar mise à jour"
+  deleteAvatarDecoration: "Décoration d'avatar supprimée"
+_fileViewer:
+  title: "Détails du fichier"
+  type: "Type du fichier"
+  size: "Taille du fichier"
+  url: "URL"
+  uploadedAt: "Date de téléversement"
+  attachedNotes: "Notes avec ce fichier"
+  thisPageCanBeSeenFromTheAuthor: "Cette page ne peut être vue que par l'utilisateur qui a téléversé ce fichier."
+_externalResourceInstaller:
+  title: "Installer depuis un site externe"
+  checkVendorBeforeInstall: "Veuillez confirmer que le distributeur est fiable avant l'installation."
+  _plugin:
+    title: "Voulez-vous installer cette extension ?"
+    metaTitle: "Informations sur l'extension"
+  _theme:
+    title: "Voulez-vous installer ce thème ?"
+    metaTitle: "Informations sur le thème"
+  _meta:
+    base: "Palette de couleurs de base"
+  _vendorInfo:
+    title: "Informations sur le distributeur"
+    endpoint: "Point de terminaison référencé"
+    hashVerify: "Vérification de l'intégrité du fichier"
+  _errors:
+    _invalidParams:
+      title: "Paramètres invalides"
+      description: "Il y a un manque d'informations nécessaires pour obtenir des données à partir de sites externes. Veuillez vérifier l'URL."
+    _resourceTypeNotSupported:
+      title: "Cette ressource externe n'est pas prise en charge."
+      description: "Le type de ressource obtenue à partir de ce site externe n'est pas pris en charge. Veuillez contacter l'administrateur du site."
+    _failedToFetch:
+      title: "Échec de récupération des données"
+      fetchErrorDescription: "La communication avec le site externe a échoué. Si vous réessayez et que cela ne s'améliore pas, veuillez contacter l'administrateur du site."
+      parseErrorDescription: "Les données obtenues à partir du site externe n'ont pas pu être parsées. Veuillez contacter l'administrateur du site."
+    _hashUnmatched:
+      title: "Échec de vérification des données"
+      description: "La vérification de l'intégrité des données fournies a échoué. Pour des raisons de sécurité, l'installation ne peut pas continuer. Veuillez contacter l'administrateur du site."
+    _pluginParseFailed:
+      title: "Erreur d'AiScript"
+      description: "Bien que les données aient été obtenues, elles n'ont pas pu être lues, car il y a eu une erreur lors du parsage d'AiScript. Veuillez contacter l'auteur de l'extension. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+    _pluginInstallFailed:
+      title: "Échec d'installation de l'extension"
+      description: "Il y a eu un problème lors de l'installation de l'extension. Veuillez réessayer. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+    _themeParseFailed:
+      title: "Erreur de parsage du thème"
+      description: "Bien que les données aient été obtenues, elles n'ont pas pu être lues, car il y a eu une erreur lors du parsage du fichier du thème. Veuillez contacter l'auteur du thème. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+    _themeInstallFailed:
+      title: "Échec d'installation du thème"
+      description: "Il y a eu un problème lors de l'installation du thème. Veuillez réessayer. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."

locales/generateDTS.js

@@ -56,6 +56,18 @@ export default function generateDTS() {
 				ts.NodeFlags.Const | ts.NodeFlags.Ambient | ts.NodeFlags.ContextFlags,
 			),
 		),
+		ts.factory.createFunctionDeclaration(
+			[ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+			undefined,
+			ts.factory.createIdentifier('build'),
+			undefined,
+			[],
+			ts.factory.createTypeReferenceNode(
+				ts.factory.createIdentifier('Locale'),
+				undefined,
+			),
+			undefined,
+		),
 		ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
 	];
 	const printed = ts.createPrinter({

locales/hr-HR.yml

@@ -1 +1,5 @@
 ---
+_lang_: "japanski"
+ok: "OK"
+gotIt: "Razumijem"
+cancel: "otkazati"

locales/ht-HT.yml

@@ -1 +1,18 @@
 ---
+_lang_: "Japonè"
+password: "modpas"
+ok: "OK"
+gotIt: "Konprann"
+cancel: "anile"
+noThankYou: "Sispann"
+instance: "sèvè"
+profile: "pwofil"
+save: "kenbe"
+delete: "efase"
+instances: "sèvè"
+remove: "efase"
+smtpPass: "modpas"
+_2fa:
+  renewTOTPCancel: "Sispann"
+_widgets:
+  profile: "pwofil"

locales/id-ID.yml

@@ -45,6 +45,7 @@ pin: "Sematkan ke profil"
 unpin: "Lepas sematan dari profil"
 copyContent: "Salin konten"
 copyLink: "Salin tautan"
+copyLinkRenote: "Salin tautan renote"
 delete: "Hapus"
 deleteAndEdit: "Hapus dan sunting"
 deleteAndEditConfirm: "Apakah kamu yakin ingin menghapus note ini dan menyuntingnya? Kamu akan kehilangan semua reaksi, renote dan balasan di note ini."
@@ -156,6 +157,7 @@ addEmoji: "Tambahkan emoji"
 settingGuide: "Pengaturan rekomendasi"
 cacheRemoteFiles: "Tembolokkan berkas dari instansi luar"
 cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas dari instansi luar akan dimuat langsung. Menonaktifkan ini akan mengurangi penggunaan penyimpanan peladen, namun dapat menyebabkan peningkatan lalu lintas bandwidth, karena keluku tidak dihasilkan."
+youCanCleanRemoteFilesCache: "Kamu dapat mengosongkan tembolok dengan mengeklik tombol 🗑️ pada layar manajemen berkas."
 cacheRemoteSensitiveFiles: "Tembolokkan berkas dari instansi luar"
 cacheRemoteSensitiveFilesDescription: "Menonaktifkan pengaturan ini menyebabkan berkas sensitif dari instansi luar ditautkan secara langsung, bukan ditembolok."
 flagAsBot: "Atur akun ini sebagai Bot"
@@ -193,6 +195,7 @@ perHour: "per Jam"
 perDay: "per Hari"
 stopActivityDelivery: "Berhenti mengirim aktivitas"
 blockThisInstance: "Blokir instansi ini"
+silenceThisInstance: "Senyapkan instansi ini"
 operations: "Tindakan"
 software: "Perangkat lunak"
 version: "Versi"
@@ -212,6 +215,8 @@ clearCachedFiles: "Hapus tembolok"
 clearCachedFilesConfirm: "Apakah kamu yakin ingin menghapus seluruh tembolok berkas instansi luar?"
 blockedInstances: "Instansi terblokir"
 blockedInstancesDescription: "Daftar nama host dari instansi yang diperlukan untuk diblokir. Instansi yang didaftarkan tidak akan dapat berkomunikasi dengan instansi ini."
+silencedInstances: "Instansi yang disenyapkan"
+silencedInstancesDescription: "Daftar nama host dari instansi yang ingin kamu senyapkan. Semua akun dari instansi yang terdaftar akan diperlakukan sebagai disenyapkan. Hal ini membuat akun hanya dapat membuat permintaan mengikuti, dan tidak dapat menyebutkan akun lokal apabila tidak mengikuti. Hal ini tidak akan mempengaruhi instansi yang diblokir."
 muteAndBlock: "Bisukan / Blokir"
 mutedUsers: "Pengguna yang dibisukan"
 blockedUsers: "Pengguna yang diblokir"
@@ -409,10 +414,14 @@ aboutMisskey: "Tentang Misskey"
 administrator: "Admin"
 token: "Token"
 2fa: "Autentikasi 2-faktor"
+setupOf2fa: "Atur autentikasi 2-faktor"
 totp: "Aplikasi autentikator"
 totpDescription: "Gunakan aplikasi autentikator untuk mendapatkan kata sandi sekali pakai"
 moderator: "Moderator"
 moderation: "Moderasi"
+moderationNote: "Catatan moderasi"
+addModerationNote: "Tambahkan catatan moderasi"
+moderationLogs: "Log moderasi"
 nUsersMentioned: "{n} pengguna disebut"
 securityKeyAndPasskey: "Security key dan passkey"
 securityKey: "Kunci keamanan"
@@ -435,7 +444,7 @@ markAsReadAllTalkMessages: "Tandai semua pesan telah dibaca"
 help: "Bantuan"
 inputMessageHere: "Ketik pesan disini"
 close: "Tutup"
-invites: "Undang"
+invites: "Undangan"
 members: "Anggota"
 transfer: "Transfer"
 title: "Judul"
@@ -450,7 +459,7 @@ noMessagesYet: "Tidak ada pesan"
 newMessageExists: "Kamu mendapatkan pesan baru"
 onlyOneFileCanBeAttached: "Kamu hanya dapat melampirkan satu berkas ke dalam pesan"
 signinRequired: "Silahkan login"
-invitations: "Undang"
+invitations: "Undangan"
 invitationCode: "Kode undangan"
 checking: "Memeriksa"
 available: "Tersedia"
@@ -506,7 +515,7 @@ showFeaturedNotesInTimeline: "Tampilkan catatan yang diunggulkan di lini masa"
 objectStorage: "Object Storage"
 useObjectStorage: "Gunakan object storage"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "Prefix URL digunakan untuk mengkonstruksi URL ke object (media) referencing. Tentukan URL jika kamu menggunakan CDN atau Proxy, jika tidak tentukan alamat yang dapat diakses secara publik sesuai dengan panduan dari layanan yang akan kamu gunakan, contohnya. 'https://<bucket>.s3.amazonaws.com' untuk AWS S3, dan 'https://storage.googleapis.com/<bucket>' untuk GCS."
+objectStorageBaseUrlDesc: "Prefix URL digunakan untuk mengonstruksi URL ke object (media) referencing. Tentukan URL jika kamu menggunakan CDN atau Proxy. Jika tidak, tentukan alamat yang dapat diakses secara publik sesuai dengan panduan dari layanan yang akan kamu gunakan. Contohnya: 'https://<bucket>.s3.amazonaws.com' untuk AWS S3, dan 'https://storage.googleapis.com/<bucket>' untuk GCS."
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Mohon tentukan nama bucket yang digunakan pada layanan yang telah dikonfigurasi."
 objectStoragePrefix: "Prefix"
@@ -523,8 +532,9 @@ objectStorageSetPublicRead: "Setel \"public-read\" disaat mengunggah"
 s3ForcePathStyleDesc: "Jika s3ForcePathStyle dinyalakan, nama bucket harus dimasukkan dalam path URL dan bukan URL nama host tersebut. Kamu perlu menyalakan pengaturan ini jika menggunakan layanan seperti instansi Minio yang self-hosted."
 serverLogs: "Log Peladen"
 deleteAll: "Hapus semua"
-showFixedPostForm: "Tampilkan form posting di atas lini masa."
+showFixedPostForm: "Tampilkan form posting di atas lini masa"
 showFixedPostFormInChannel: "Tampilkan form posting di atas lini masa (Kanal)"
+withRepliesByDefaultForNewlyFollowed: "Termasuk balasan dari pengguna baru yang diikuti pada lini masa secara bawaan"
 newNoteRecived: "Kamu mendapat catatan baru"
 sounds: "Bunyi"
 sound: "Bunyi"
@@ -627,7 +637,7 @@ testEmail: "Tes pengiriman surel"
 wordMute: "Bisukan kata"
 regexpError: "Kesalahan ekspresi reguler"
 regexpErrorDescription: "Galat terjadi pada baris {line} ekspresi reguler dari {tab} kata yang dibisukan:"
-instanceMute: "Bisuka instansi"
+instanceMute: "Bisukan instansi"
 userSaysSomething: "{name} mengatakan sesuatu"
 makeActive: "Aktifkan"
 display: "Tampilkan"
@@ -652,6 +662,7 @@ behavior: "Perilaku"
 sample: "Contoh"
 abuseReports: "Laporkan"
 reportAbuse: "Laporkan"
+reportAbuseRenote: "Laporkan renote"
 reportAbuseOf: "Laporkan {name}"
 fillAbuseReportDescription: "Mohon isi rincian laporan. Jika laporan ini mengenai catatan yang spesifik, mohon lampirkan serta URL catatan tersebut."
 abuseReported: "Laporan kamu telah dikirimkan. Terima kasih."
@@ -704,6 +715,7 @@ lockedAccountInfo: "Kecuali kamu menyetel visibilitas catatan milikmu ke \"Hanya
 alwaysMarkSensitive: "Tandai media dalam catatan sebagai media sensitif"
 loadRawImages: "Tampilkan lampiran gambar secara penuh daripada thumbnail"
 disableShowingAnimatedImages: "Jangan mainkan gambar bergerak"
+highlightSensitiveMedia: "Sorot media sensitif"
 verificationEmailSent: "Surel verifikasi telah dikirimkan. Mohon akses tautan yang telah disertakan untuk menyelesaikan verifikasi."
 notSet: "Tidak disetel"
 emailVerified: "Surel telah diverifikasi"
@@ -1018,6 +1030,7 @@ retryAllQueuesConfirmText: "Hal ini akan meningkatkan beban sementara ke peladen
 enableChartsForRemoteUser: "Buat bagan data pengguna instansi luar"
 enableChartsForFederatedInstances: "Buat bagan data peladen instansi luar"
 showClipButtonInNoteFooter: "Tambahkan \"Klip\" ke menu aksi catatan"
+reactionsDisplaySize: "Ukuran tampilan reaksi"
 noteIdOrUrl: "ID catatan atau URL"
 video: "Video"
 videos: "Video"
@@ -1098,9 +1111,44 @@ icon: "Avatar"
 forYou: "Untuk Anda"
 currentAnnouncements: "Pengumuman Saat Ini"
 pastAnnouncements: "Pengumuman Terdahulu"
+youHaveUnreadAnnouncements: "Terdapat pengumuman yang belum dibaca"
+useSecurityKey: "Mohon ikuti instruksi peramban atau perangkat kamu untuk menggunakan kunci pengaman atau passkey."
 replies: "Balas"
 renotes: "Renote"
+loadReplies: "Tampilkan balasan"
+loadConversation: "Tampilkan percakapan"
+pinnedList: "Daftar yang dipin"
+keepScreenOn: "Biarkan layar tetap menyala"
+verifiedLink: "Tautan kepemilikan telah diverifikasi"
+notifyNotes: "Beritahu mengenai catatan baru"
+unnotifyNotes: "Berhenti memberitahu mengenai catatan baru"
+authentication: "Autentikasi"
+authenticationRequiredToContinue: "Mohon autentikasikan terlebih dahulu sebelum melanjutkan"
 dateAndTime: "Tanggal dan Waktu"
+showRenotes: "Tampilkan renote"
+edited: "Telah disunting"
+notificationRecieveConfig: "Pengaturan notifikasi"
+mutualFollow: "Saling mengikuti"
+fileAttachedOnly: "Hanya catatan dengan berkas"
+showRepliesToOthersInTimeline: "Tampilkan balasan ke pengguna lain dalam lini masa"
+hideRepliesToOthersInTimeline: "Sembunyikan balasan ke orang lain dari lini masa"
+externalServices: "Layanan eksternal"
+impressum: "Impressum"
+impressumUrl: "Tautan Impressum"
+impressumDescription: "Pada beberapa negara seperti Jerman, inklusi dari informasi kontak operator (sebuah Impressum) diperlukan secara legal untuk situs web komersil."
+privacyPolicy: "Kebijakan Privasi"
+privacyPolicyUrl: "Tautan Kebijakan Privasi"
+tosAndPrivacyPolicy: "Syarat dan Ketentuan serta Kebijakan Privasi"
+flip: "Balik"
+_announcement:
+  forExistingUsers: "Hanya pengguna yang telah ada"
+  forExistingUsersDescription: "Pengumuman ini akan dimunculkan ke pengguna yang sudah ada dari titik waktu publikasi jika dinyalakan. Apabila dimatikan, mereka yang baru mendaftar setelah publikasi ini akan juga melihatnya."
+  needConfirmationToRead: "Membutuhkan konfirmasi terpisah bahwa telah dibaca"
+  needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan. Pengumuman ini juga akan dikecualikan dari fungsi \"Tandai semua telah dibaca\"."
+  end: "Arsipkan pengumuman"
+  tooManyActiveAnnouncementDescription: "Terlalu banyak pengumuman dapat memperburuk pengalaman pengguna. Mohon pertimbangkan untuk mengarsipkan pengumuman yang sudah usang/tidak relevan."
+  readConfirmTitle: "Tandai telah dibaca?"
+  readConfirmText: "Aksi ini akan menandai konten dari \"{title}\" telah dibaca."
 _initialAccountSetting:
   accountCreated: "Akun kamu telah sukses dibuat!"
   letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
@@ -1113,13 +1161,19 @@ _initialAccountSetting:
   pushNotificationDescription: "Menyalakan notifikasi dorong akan membuatmu menerima notifikasi dari {name} secara langsung ke perangkatmu."
   initialAccountSettingCompleted: "Pengaturan profil selesai!"
   haveFun: "Selamat menikmati, {name}!"
-  ifYouNeedLearnMore: "Kalau kamu ingin mempelajari lebih lanjut bagaimana cara menggunakan {name} (Misskey), silahkan kunjungi {link}."
   skipAreYouSure: "Yakin melewati atur profil?"
   laterAreYouSure: "Yakin banget untuk atur profil nanti?"
 _serverRules:
   description: "Daftar peraturan akan ditampilkan sebelum pendaftaran. Mengatur ringkasan dari Syarat dan Ketentuan sangat direkomendasikan."
 _serverSettings:
   iconUrl: "URL ikon"
+  appIconDescription: "Tentukan ikon yang digunakan ketika {host} ditampilkan sebagai aplikasi."
+  appIconUsageExample: "Contoh: Sebagai PWA, atau ketika ditampilkan sebagai markah layar beranda pada ponsel"
+  appIconStyleRecommendation: "Karena ikon berkemungkinan dipotong menjadi persegi atau lingkaran, ikon dengan margin terwanai di sekeliling konten sangat direkomendasikan."
+  appIconResolutionMustBe: "Minimum resolusi adalah {resolution}."
+  manifestJsonOverride: "Ambil alih manifest.json"
+  shortName: "Nama pendek"
+  shortNameDescription: "Inisial untuk nama instansi yang dapat ditampilkan apabila nama lengkap resmi terlalu panjang."
 _accountMigration:
   moveFrom: "Pindahkan akun lain ke akun ini"
   moveFromSub: "Buat alias ke akun lain"
@@ -1374,6 +1428,9 @@ _achievements:
       title: "Brain Diver"
       description: "Posting tautan mengenai Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "Tes overflow"
+      description: "Picu tes notifikasi secara berulang dalam waktu yang sangat pendek"
 _role:
   new: "Buat peran"
   edit: "Sunting peran"
@@ -1431,6 +1488,7 @@ _role:
     descriptionOfRateLimitFactor: "Batas kecepatan yang rendah tidak begitu membatasi, batas kecepatan tinggi lebih membatasi. "
     canHideAds: "Dapat menyembunyikan iklan"
     canSearchNotes: "Penggunaan pencarian catatan"
+    canUseTranslator: "Penggunaan penerjemah"
   _condition:
     isLocal: "Pengguna lokal"
     isRemote: "Pengguna remote"
@@ -1479,6 +1537,10 @@ _ad:
   reduceFrequencyOfThisAd: "Tampilkan iklan ini lebih sedikit"
   hide: "Jangan tampilkan"
   timezoneinfo: "Hari dalam satu minggu ditentukan dari zona waktu peladen."
+  adsSettings: "Pengaturan iklan"
+  notesPerOneAd: "Interval penempatan pemutakhiran iklan secara real-time (catatan per iklan)"
+  setZeroToDisable: "Atur nilai ini ke 0 untuk menonaktifkan pemutakhiran iklan secara real-time"
+  adsTooClose: "Interval iklan saat ini kemungkinan memperburuk pengalaman pengguna secara signifikan karena diatur pada nilai yang terlalu rendah."
 _forgotPassword:
   enterEmail: "Masukkan alamat surel yang kamu gunakan pada saat mendaftar. Sebuah tautan untuk mengatur ulang kata sandi kamu akan dikirimkan ke alamat surel tersebut."
   ifNoEmail: "Apabila kamu tidak menggunakan surel pada saat pendaftaran, mohon hubungi admin segera."
@@ -1662,28 +1724,20 @@ _time:
   minute: "menit"
   hour: "jam"
   day: "hari"
-_timelineTutorial:
-  title: "Bagaimana cara menggunakan Misskey"
-  step1_1: "Ini adalah \"lini masa\". Semua \"catatan\" yang dikirimkan oleh {name} akan dimunculkan secara kronologis di sini."
-  step1_2: "Ada beberapa lini masa yang berbeda. Seperti contoh, \"Lini masa Beranda\" berisi catatan dari pengguna yang kamu ikuti, dan \"Lini masa lokal\" berisi catatan dari semua pengguna dari {name}."
-  step2_1: "Selanjutnya, mari kita coba memposting sebuah catatan. Kamu dapat melakukanya dengan menekan tombol dengan ikon pensil."
-  step2_2: "Bagaimana dengan menuliskan sedikit perkenalan diri, atau hanya \"Hello {name}\" kalau kamu lagi ngga feeling?"
-  step3_1: "Udah selesai memposting catatan pertamamu?"
-  step3_2: "Catatan pertamamu seharusnya sekarang sudah tampil di lini masa kamu."
-  step4_1: "Kamu dapat menyisipkan \"Reaksi\" ke dalam catatan."
-  step4_2: "Untuk menyisipkan reaksi, tekan tanda \"+\" dalam catatan dan pilih emoji yang kamu suka untuk mereaksi catatan tersebut."
 _2fa:
-  alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
+  alreadyRegistered: "Kamu telah mendaftarkan perangkat autentikasi 2-faktor."
   registerTOTP: "Daftarkan aplikasi autentikator"
-  step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu."
+  step1: "Pertama, pasang aplikasi autentikasi (seperti {a} atau {b}) di perangkat kamu."
   step2: "Lalu, pindai kode QR yang ada di layar."
   step2Click: "Mengeklik kode QR ini akan membolehkanmu untuk mendaftarkan 2FA ke security-key atau aplikasi autentikator ponsel."
+  step2Uri: "Masukkan URI berikut jika kamu menggunakan program desktop"
   step3Title: "Masukkan kode autentikasi"
   step3: "Masukkan token yang telah disediakan oleh aplikasimu untuk menyelesaikan pemasangan."
-  step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi otentikasi kamu."
+  setupCompleted: "Penyetelan autentikasi 2-faktor selesai"
+  step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi autentikasi kamu."
   securityKeyNotSupported: "Peramban kamu tidak mendukung security key."
   registerTOTPBeforeKey: "Mohon atur aplikasi autentikator untuk mendaftarkan security key atau passkey."
-  securityKeyInfo: "Kamu dapat memasang otentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau otentikasi PIN pada perangkatmu."
+  securityKeyInfo: "Kamu dapat memasang autentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau autentikasi PIN pada perangkatmu."
   registerSecurityKey: "Daftarkan security key atau passkey."
   securityKeyName: "Masukkan nama key."
   tapSecurityKey: "Mohon ikuti peramban kamu untuk mendaftarkan security key atau passkey"
@@ -1694,7 +1748,11 @@ _2fa:
   renewTOTPConfirm: "Hal ini akan menyebabkan kode verifikasi dari aplikasi autentikator sebelumnya berhenti bekerja"
   renewTOTPOk: "Atur ulang"
   renewTOTPCancel: "Tidak sekarang."
+  checkBackupCodesBeforeCloseThisWizard: "Sebelum kamu menutup jendela ini, pastikan untuk memperhatikan dan mencadangkan kode cadangan berikut."
   backupCodes: "Kode Pencadangan"
+  backupCodesDescription: "Kamu dapat menggunakan kode ini untuk mendapatkan akses ke akun kamu apabila berada dalam situasi tidak dapat menggunakan aplikasi autentikasi 2-faktor yang kamu miliki. Setiap kode hanya dapat digunakan satu kali. Mohon simpan kode ini di tempat yang aman."
+  backupCodeUsedWarning: "Kode cadangan telah digunakan. Mohon mengatur ulang autentikasi 2-faktor secepatnya apabila kamu sudah tidak dapat menggunakannya lagi."
+  backupCodesExhaustedWarning: "Semua kode cadangan telah digunakan. Apabila kamu kehilangan akses pada aplikasi autentikasi 2-faktor milikmu, kamu tidak dapat mengakses akun ini lagi. Mohon atur ulang autentikasi 2-faktor kamu."
 _permissions:
   "read:account": "Lihat informasi akun"
   "write:account": "Sunting informasi akun"
@@ -1728,6 +1786,10 @@ _permissions:
   "write:gallery": "Sunting galeri"
   "read:gallery-likes": "Lihat daftar postingan galeri yang disukai"
   "write:gallery-likes": "Sunting daftar postingan galeri yang disukai"
+  "read:flash": "Lihat Play"
+  "write:flash": "Sunting Play"
+  "read:flash-likes": "Lihat daftar Play yang disukai"
+  "write:flash-likes": "Sunting daftar Play yang disukai"
 _auth:
   shareAccessTitle: "Mendapatkan ijin akses aplikasi"
   shareAccess: "Apakah kamu ingin mengijinkan \"{name}\" untuk mengakses akun ini?"
@@ -1743,6 +1805,7 @@ _antennaSources:
   homeTimeline: "Catatan dari pengguna yang diikuti"
   users: "Catatan dari pengguna tertentu"
   userList: "Catatan dari daftar tertentu"
+  userBlacklist: "Semua catatan kecuali untuk satu pengguna atau lebih yang telah ditentukan"
 _weekday:
   sunday: "Minggu"
   monday: "Senin"
@@ -1842,6 +1905,7 @@ _profile:
   metadataContent: "Isi"
   changeAvatar: "Ubah avatar"
   changeBanner: "Ubah header"
+  verifiedLinkDescription: "Dengan memasukkan URL yang mengandung tautan ke profil kamu di sini, ikon verifikasi kepemilikan dapat ditampilkan di sebelah kolom ini."
 _exportOrImport:
   allNotes: "Semua catatan"
   favoritedNotes: "Catatan favorit"
@@ -1851,6 +1915,7 @@ _exportOrImport:
   userLists: "Daftar"
   excludeMutingUsers: "Kecualikan pengguna yang dibisukan"
   excludeInactiveUsers: "Kecualikan pengguna tidak aktif"
+  withReplies: "Termasuk balasan dari pengguna yang diimpor ke dalam lini masa"
 _charts:
   federation: "Federasi"
   apRequest: "Permintaan"
@@ -1960,11 +2025,17 @@ _notification:
   youReceivedFollowRequest: "Kamu menerima permintaan mengikuti"
   yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima"
   pollEnded: "Hasil Kuesioner telah keluar"
+  newNote: "Catatan baru"
   unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Pembaruan notifikasi dorong"
   achievementEarned: "Pencapaian didapatkan"
+  testNotification: "Tes notifikasi"
+  checkNotificationBehavior: "Cek tampilan notifikasi"
+  sendTestNotification: "Kirim tes notifikasi"
+  notificationWillBeDisplayedLikeThis: "Notifikasi akan terlihat seperti ini"
   _types:
     all: "Semua"
+    note: "Catatan baru"
     follow: "Ikuti"
     mention: "Sebut"
     reply: "Balasan"
@@ -1998,6 +2069,8 @@ _deck:
   introduction2: "Klik \"+\" pada kanan layar untuk menambahkan kolom baru kapanpun yang kamu mau."
   widgetsIntroduction: "Mohon pilih \"Sunting gawit\" pada menu kolom dan tambahkan gawit."
   useSimpleUiForNonRootPages: "Gunakan antarmuka sederhana ke halaman yang dituju"
+  usedAsMinWidthWhenFlexible: "Lebar minimum akan digunakan untuk ini ketika opsi \"Atur-otomatis lebar\" dinyalakan"
+  flexible: "Atur-otomatis lebar"
   _columns:
     main: "Utama"
     widgets: "Widget"
@@ -2033,6 +2106,41 @@ _webhookSettings:
     reaction: "Ketika menerima reaksi"
     mention: "Ketika sedang disebut"
 _moderationLogTypes:
+  createRole: "Peran telah dibuat"
+  deleteRole: "Peran telah dihapus"
+  updateRole: "Peran telah diperbaharui"
+  assignRole: "Yang ditugaskan dalam peran"
+  unassignRole: "Dihapus dari peran"
   suspend: "Tangguhkan"
+  unsuspend: "Batal ditangguhkan"
+  addCustomEmoji: "Emoji kustom ditambahkan"
+  updateCustomEmoji: "Emoji kustom diperbaharui"
+  deleteCustomEmoji: "Emoji kustom dihapus"
+  updateServerSettings: "Pengaturan peladen diperbaharui"
+  updateUserNote: "Catatan moderasi diperbaharui"
+  deleteDriveFile: "Berkas dihapus"
+  deleteNote: "Catatan dihapus"
+  createGlobalAnnouncement: "Pengumuman global dibuat"
+  createUserAnnouncement: "Pengumuman pengguna dibuat"
+  updateGlobalAnnouncement: "Pengumuman global diperbaharui"
+  updateUserAnnouncement: "Pengumuman pengguna diperbaharui"
+  deleteGlobalAnnouncement: "Pengumuman global telah dihapus"
+  deleteUserAnnouncement: "Pengumuman pengguna telah dihapus."
   resetPassword: "Atur ulang kata sandi"
+  suspendRemoteInstance: "Instansi luar telah ditangguhkan"
+  unsuspendRemoteInstance: "Instansi luar batal ditangguhkan"
+  markSensitiveDriveFile: "Berkas ditandai sensitif"
+  unmarkSensitiveDriveFile: "Berkas batal ditandai sensitif"
+  resolveAbuseReport: "Laporan terselesaikan"
   createInvitation: "Buat kode undangan"
+  createAd: "Iklan telah dibuat"
+  deleteAd: "Iklan telah dihapus"
+  updateAd: "Iklan telah diperbaharui"
+_fileViewer:
+  title: "Rincian berkas"
+  type: "Jenis berkas"
+  size: "Ukuran berkas"
+  url: "URL"
+  uploadedAt: "Diunggah pada"
+  attachedNotes: "Catatan yang dilampirkan"
+  thisPageCanBeSeenFromTheAuthor: "Halaman ini hanya dapat dilihat oleh pengguna yang mengunggah bekas ini."

locales/index.d.ts

@@ -264,6 +264,7 @@ export interface Locale {
     "removeAreYouSure": string;
     "deleteAreYouSure": string;
     "resetAreYouSure": string;
+    "areYouSure": string;
     "saved": string;
     "messaging": string;
     "upload": string;
@@ -314,6 +315,7 @@ export interface Locale {
     "createFolder": string;
     "renameFolder": string;
     "deleteFolder": string;
+    "folder": string;
     "addFile": string;
     "emptyDrive": string;
     "emptyFolder": string;
@@ -440,7 +442,6 @@ export interface Locale {
     "notFound": string;
     "notFoundDescription": string;
     "uploadFolder": string;
-    "cacheClear": string;
     "markAsReadAllNotifications": string;
     "markAsReadAllUnreadNotes": string;
     "markAsReadAllTalkMessages": string;
@@ -547,6 +548,8 @@ export interface Locale {
     "popout": string;
     "volume": string;
     "masterVolume": string;
+    "notUseSound": string;
+    "useSoundOnlyWhenActive": string;
     "details": string;
     "chooseEmoji": string;
     "unableToProcess": string;
@@ -567,6 +570,10 @@ export interface Locale {
     "script": string;
     "disablePagesScript": string;
     "updateRemoteUser": string;
+    "unsetUserAvatar": string;
+    "unsetUserAvatarConfirm": string;
+    "unsetUserBanner": string;
+    "unsetUserBannerConfirm": string;
     "deleteAllFiles": string;
     "deleteAllFilesConfirm": string;
     "removeAllFollowing": string;
@@ -638,6 +645,7 @@ export interface Locale {
     "smtpSecureInfo": string;
     "testEmail": string;
     "wordMute": string;
+    "hardWordMute": string;
     "regexpError": string;
     "regexpErrorDescription": string;
     "instanceMute": string;
@@ -982,6 +990,7 @@ export interface Locale {
     "unassign": string;
     "color": string;
     "manageCustomEmojis": string;
+    "manageAvatarDecorations": string;
     "youCannotCreateAnymore": string;
     "cannotPerformTemporary": string;
     "cannotPerformTemporaryDescription": string;
@@ -1022,6 +1031,8 @@ export interface Locale {
     "sensitiveWords": string;
     "sensitiveWordsDescription": string;
     "sensitiveWordsDescription2": string;
+    "hiddenTags": string;
+    "hiddenTagsDescription": string;
     "notesSearchNotAvailable": string;
     "license": string;
     "unfavoriteConfirm": string;
@@ -1034,6 +1045,7 @@ export interface Locale {
     "enableChartsForFederatedInstances": string;
     "showClipButtonInNoteFooter": string;
     "reactionsDisplaySize": string;
+    "limitWidthOfReaction": string;
     "noteIdOrUrl": string;
     "video": string;
     "videos": string;
@@ -1135,6 +1147,10 @@ export interface Locale {
     "fileAttachedOnly": string;
     "showRepliesToOthersInTimeline": string;
     "hideRepliesToOthersInTimeline": string;
+    "showRepliesToOthersInTimelineAll": string;
+    "hideRepliesToOthersInTimelineAll": string;
+    "confirmShowRepliesAll": string;
+    "confirmHideRepliesAll": string;
     "externalServices": string;
     "impressum": string;
     "impressumUrl": string;
@@ -1142,6 +1158,24 @@ export interface Locale {
     "privacyPolicy": string;
     "privacyPolicyUrl": string;
     "tosAndPrivacyPolicy": string;
+    "avatarDecorations": string;
+    "attach": string;
+    "detach": string;
+    "detachAll": string;
+    "angle": string;
+    "flip": string;
+    "showAvatarDecorations": string;
+    "releaseToRefresh": string;
+    "refreshing": string;
+    "pullDownToRefresh": string;
+    "disableStreamingTimeline": string;
+    "useGroupedNotifications": string;
+    "signupPendingError": string;
+    "cwNotationRequired": string;
+    "doReaction": string;
+    "code": string;
+    "reloadRequiredToApplySettings": string;
+    "remainingN": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;
@@ -1151,6 +1185,10 @@ export interface Locale {
         "tooManyActiveAnnouncementDescription": string;
         "readConfirmTitle": string;
         "readConfirmText": string;
+        "shouldNotBeUsedToPresentPermanentInfo": string;
+        "dialogAnnouncementUxWarn": string;
+        "silence": string;
+        "silenceDescription": string;
     };
     "_initialAccountSetting": {
         "accountCreated": string;
@@ -1164,10 +1202,91 @@ export interface Locale {
         "pushNotificationDescription": string;
         "initialAccountSettingCompleted": string;
         "haveFun": string;
-        "ifYouNeedLearnMore": string;
+        "youCanContinueTutorial": string;
+        "startTutorial": string;
         "skipAreYouSure": string;
         "laterAreYouSure": string;
     };
+    "_initialTutorial": {
+        "launchTutorial": string;
+        "title": string;
+        "wellDone": string;
+        "skipAreYouSure": string;
+        "_landing": {
+            "title": string;
+            "description": string;
+        };
+        "_note": {
+            "title": string;
+            "description": string;
+            "reply": string;
+            "renote": string;
+            "reaction": string;
+            "menu": string;
+        };
+        "_reaction": {
+            "title": string;
+            "description": string;
+            "letsTryReacting": string;
+            "reactToContinue": string;
+            "reactNotification": string;
+            "reactDone": string;
+        };
+        "_timeline": {
+            "title": string;
+            "description1": string;
+            "home": string;
+            "local": string;
+            "social": string;
+            "global": string;
+            "description2": string;
+            "description3": string;
+        };
+        "_postNote": {
+            "title": string;
+            "description1": string;
+            "_visibility": {
+                "description": string;
+                "public": string;
+                "home": string;
+                "followers": string;
+                "direct": string;
+                "doNotSendConfidencialOnDirect1": string;
+                "doNotSendConfidencialOnDirect2": string;
+                "localOnly": string;
+            };
+            "_cw": {
+                "title": string;
+                "description": string;
+                "_exampleNote": {
+                    "cw": string;
+                    "note": string;
+                };
+                "useCases": string;
+            };
+        };
+        "_howToMakeAttachmentsSensitive": {
+            "title": string;
+            "description": string;
+            "tryThisFile": string;
+            "_exampleNote": {
+                "note": string;
+            };
+            "method": string;
+            "sensitiveSucceeded": string;
+            "doItToContinue": string;
+        };
+        "_done": {
+            "title": string;
+            "description": string;
+        };
+    };
+    "_timelineDescription": {
+        "home": string;
+        "local": string;
+        "social": string;
+        "global": string;
+    };
     "_serverRules": {
         "description": string;
     };
@@ -1180,6 +1299,9 @@ export interface Locale {
         "manifestJsonOverride": string;
         "shortName": string;
         "shortNameDescription": string;
+        "fanoutTimelineDescription": string;
+        "fanoutTimelineDbFallback": string;
+        "fanoutTimelineDbFallbackDescription": string;
     };
     "_accountMigration": {
         "moveFrom": string;
@@ -1514,6 +1636,10 @@ export interface Locale {
                 "title": string;
                 "description": string;
             };
+            "_tutorialCompleted": {
+                "title": string;
+                "description": string;
+            };
         };
     };
     "_role": {
@@ -1526,7 +1652,9 @@ export interface Locale {
         "assignTarget": string;
         "descriptionOfAssignTarget": string;
         "manual": string;
+        "manualRoles": string;
         "conditional": string;
+        "conditionalRoles": string;
         "condition": string;
         "isConditionalRole": string;
         "isPublic": string;
@@ -1560,6 +1688,7 @@ export interface Locale {
             "inviteLimitCycle": string;
             "inviteExpirationTime": string;
             "canManageCustomEmojis": string;
+            "canManageAvatarDecorations": string;
             "driveCapacity": string;
             "alwaysMarkNsfw": string;
             "pinMax": string;
@@ -1575,6 +1704,7 @@ export interface Locale {
             "canHideAds": string;
             "canSearchNotes": string;
             "canUseTranslator": string;
+            "avatarDecorationLimit": string;
         };
         "_condition": {
             "isLocal": string;
@@ -1696,6 +1826,7 @@ export interface Locale {
         "donate": string;
         "morePatrons": string;
         "patrons": string;
+        "projectMembers": string;
     };
     "_displayOfSensitiveMedia": {
         "respect": string;
@@ -1724,6 +1855,7 @@ export interface Locale {
         "notesCount": string;
         "nameAndDescription": string;
         "nameOnly": string;
+        "allowRenoteToExternal": string;
     };
     "_menuDisplay": {
         "sideFull": string;
@@ -1821,6 +1953,15 @@ export interface Locale {
         "notification": string;
         "antenna": string;
         "channel": string;
+        "reaction": string;
+    };
+    "_soundSettings": {
+        "driveFile": string;
+        "driveFileWarn": string;
+        "driveFileTypeWarn": string;
+        "driveFileTypeWarnDescription": string;
+        "driveFileDurationWarn": string;
+        "driveFileDurationWarnDescription": string;
     };
     "_ago": {
         "future": string;
@@ -1834,23 +1975,21 @@ export interface Locale {
         "yearsAgo": string;
         "invalid": string;
     };
+    "_timeIn": {
+        "seconds": string;
+        "minutes": string;
+        "hours": string;
+        "days": string;
+        "weeks": string;
+        "months": string;
+        "years": string;
+    };
     "_time": {
         "second": string;
         "minute": string;
         "hour": string;
         "day": string;
     };
-    "_timelineTutorial": {
-        "title": string;
-        "step1_1": string;
-        "step1_2": string;
-        "step2_1": string;
-        "step2_2": string;
-        "step3_1": string;
-        "step3_2": string;
-        "step4_1": string;
-        "step4_2": string;
-    };
     "_2fa": {
         "alreadyRegistered": string;
         "registerTOTP": string;
@@ -1977,6 +2116,7 @@ export interface Locale {
             "chooseList": string;
         };
         "clicker": string;
+        "birthdayFollowings": string;
     };
     "_cw": {
         "hide": string;
@@ -2045,6 +2185,7 @@ export interface Locale {
         "changeAvatar": string;
         "changeBanner": string;
         "verifiedLinkDescription": string;
+        "avatarDecorationMax": string;
     };
     "_exportOrImport": {
         "allNotes": string;
@@ -2182,6 +2323,9 @@ export interface Locale {
         "checkNotificationBehavior": string;
         "sendTestNotification": string;
         "notificationWillBeDisplayedLikeThis": string;
+        "reactedBySomeUsers": string;
+        "renotedBySomeUsers": string;
+        "followedBySomeUsers": string;
         "_types": {
             "all": string;
             "note": string;
@@ -2295,6 +2439,11 @@ export interface Locale {
         "createAd": string;
         "deleteAd": string;
         "updateAd": string;
+        "createAvatarDecoration": string;
+        "updateAvatarDecoration": string;
+        "deleteAvatarDecoration": string;
+        "unsetUserAvatar": string;
+        "unsetUserBanner": string;
     };
     "_fileViewer": {
         "title": string;
@@ -2305,8 +2454,82 @@ export interface Locale {
         "attachedNotes": string;
         "thisPageCanBeSeenFromTheAuthor": string;
     };
+    "_externalResourceInstaller": {
+        "title": string;
+        "checkVendorBeforeInstall": string;
+        "_plugin": {
+            "title": string;
+            "metaTitle": string;
+        };
+        "_theme": {
+            "title": string;
+            "metaTitle": string;
+        };
+        "_meta": {
+            "base": string;
+        };
+        "_vendorInfo": {
+            "title": string;
+            "endpoint": string;
+            "hashVerify": string;
+        };
+        "_errors": {
+            "_invalidParams": {
+                "title": string;
+                "description": string;
+            };
+            "_resourceTypeNotSupported": {
+                "title": string;
+                "description": string;
+            };
+            "_failedToFetch": {
+                "title": string;
+                "fetchErrorDescription": string;
+                "parseErrorDescription": string;
+            };
+            "_hashUnmatched": {
+                "title": string;
+                "description": string;
+            };
+            "_pluginParseFailed": {
+                "title": string;
+                "description": string;
+            };
+            "_pluginInstallFailed": {
+                "title": string;
+                "description": string;
+            };
+            "_themeParseFailed": {
+                "title": string;
+                "description": string;
+            };
+            "_themeInstallFailed": {
+                "title": string;
+                "description": string;
+            };
+        };
+    };
+    "_dataSaver": {
+        "_media": {
+            "title": string;
+            "description": string;
+        };
+        "_avatar": {
+            "title": string;
+            "description": string;
+        };
+        "_urlPreview": {
+            "title": string;
+            "description": string;
+        };
+        "_code": {
+            "title": string;
+            "description": string;
+        };
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
 };
+export function build(): Locale;
 export default locales;

locales/index.js

@@ -51,20 +51,37 @@ const primaries = {
 // 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
 const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
+export function build() {
+	const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
 
-export default Object.entries(locales)
-	.reduce((a, [k ,v]) => (a[k] = (() => {
-		const [lang] = k.split('-');
-		switch (k) {
-			case 'ja-JP': return v;
-			case 'ja-KS':
-			case 'en-US': return merge(locales['ja-JP'], v);
-			default: return merge(
-				locales['ja-JP'],
-				locales['en-US'],
-				locales[`${lang}-${primaries[lang]}`] || {},
-				v
-			);
+	// 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
+	const removeEmpty = (obj) => {
+		for (const [k, v] of Object.entries(obj)) {
+			if (v === '') {
+				delete obj[k];
+			} else if (typeof v === 'object') {
+				removeEmpty(v);
+			}
 		}
-	})(), a), {});
+		return obj;
+	};
+	removeEmpty(locales);
+
+	return Object.entries(locales)
+		.reduce((a, [k, v]) => (a[k] = (() => {
+			const [lang] = k.split('-');
+			switch (k) {
+				case 'ja-JP': return v;
+				case 'ja-KS':
+				case 'en-US': return merge(locales['ja-JP'], v);
+				default: return merge(
+					locales['ja-JP'],
+					locales['en-US'],
+					locales[`${lang}-${primaries[lang]}`] ?? {},
+					v
+				);
+			}
+		})(), a), {});
+}
+
+export default build();

locales/it-IT.yml

@@ -110,14 +110,14 @@ unrenote: "Elimina la Rinota"
 renoted: "Rinotato!"
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
-quote: "Cita"
+quote: "Citazione"
 inChannelRenote: "Rinota nel canale"
 inChannelQuote: "Cita nel canale"
 pinnedNote: "Nota in primo piano"
 pinned: "Fissa sul profilo"
 you: "Tu"
-clickToShow: "Clicca per visualizzare"
-sensitive: "Esplicito"
+clickToShow: "Contenuto occultato, cliccare solo se si intende vedere"
+sensitive: "Allegato esplicito"
 add: "Aggiungi"
 reaction: "Reazioni"
 reactions: "Reazioni"
@@ -162,8 +162,8 @@ cacheRemoteSensitiveFiles: "Copia nella cache locale i file espliciti remoti"
 cacheRemoteSensitiveFilesDescription: "Disattivando questa opzione, i file espliciti verranno richiesti direttamente all'istanza remota senza essere salvati nel server locale."
 flagAsBot: "Io sono un robot"
 flagAsBotDescription: "Attiva questo campo se il profilo esegue principalmente operazioni automatiche. L'attivazione segnala agli altri sviluppatori come comportarsi per evitare catene d’interazione infinite con altri bot. I sistemi interni di Misskey si adegueranno al fine di trattare questo profilo come bot."
-flagAsCat: "Sono un gatto"
-flagAsCatDescription: "La modalità \"sono un gatto\" aggiunge le orecchie al tuo profilo"
+flagAsCat: "MIIaaaoo!!! (Io sono un gatto è un romanzo del 1905, il primo dello scrittore giapponese Natsume Sōseki)"
+flagAsCatDescription: "Miaoo mia miao mi miao?"
 flagShowTimelineReplies: "Mostra le risposte alle note sulla timeline."
 flagShowTimelineRepliesDescription: "Attivando, la timeline mostra le Note del profilo ed anche le risposte ad altre Note"
 autoAcceptFollowed: "Accetta automaticamente le richieste di follow da profili che già segui"
@@ -195,6 +195,7 @@ perHour: "orario"
 perDay: "giornaliero"
 stopActivityDelivery: "Interrompi la distribuzione di attività"
 blockThisInstance: "Blocca questa istanza"
+silenceThisInstance: "Silenzia l'istanza"
 operations: "Operazioni"
 software: "Software"
 version: "Versione"
@@ -214,6 +215,8 @@ clearCachedFiles: "Svuota cache"
 clearCachedFilesConfirm: "Vuoi davvero svuotare la cache da tutti i file remoti?"
 blockedInstances: "Istanze bloccate"
 blockedInstancesDescription: "Elenca le istanze che vuoi bloccare, una per riga. Esse non potranno più interagire con la tua istanza."
+silencedInstances: "Istanze silenziate"
+silencedInstancesDescription: "Elenca i nomi host delle istanze che vuoi silenziare. Tutti i profili nelle istanze silenziate vengono trattati come tali. Possono solo inviare richieste di follow e menzionare soltanto i profili locali che seguono. Le istanze bloccate non sono interessate."
 muteAndBlock: "Silenziati / Bloccati"
 mutedUsers: "Profili silenziati"
 blockedUsers: "Profili bloccati"
@@ -238,7 +241,7 @@ publishing: "Pubblicazione"
 notResponding: "Nessuna risposta"
 instanceFollowing: "Seguiti dall'istanza"
 instanceFollowers: "Follower dell'istanza"
-instanceUsers: "Utenti dell'istanza"
+instanceUsers: "Profili nell'istanza"
 changePassword: "Aggiorna Password"
 security: "Sicurezza"
 retypedNotMatch: "Le password non corrispondono."
@@ -247,7 +250,7 @@ newPassword: "Nuova Password"
 newPasswordRetype: "Conferma password"
 attachFile: "Allega file"
 more: "Di più!"
-featured: "Tendenze"
+featured: "In evidenza"
 usernameOrUserId: "Nome utente o ID"
 noSuchUser: "Profilo non trovato"
 lookup: "Ricerca remota"
@@ -278,7 +281,7 @@ agreeTo: "Sono d'accordo con {0}"
 agree: "Accetto"
 agreeBelow: "Accetto quanto riportato sotto"
 basicNotesBeforeCreateAccount: "Note importanti"
-termsOfService: "Informativa ai sensi degli artt. 13 e 14 del Regolamento UE 2016/679 per la protezione dei dati personali (GDPR)"
+termsOfService: "Condizioni d'uso del servizio"
 start: "Inizia!"
 home: "Home"
 remoteUserCaution: "Le informazioni potrebbero essere incomplete poiché questo profilo remoto potrebbe non essere completamente federato."
@@ -323,9 +326,9 @@ avatar: "Foto del profilo"
 banner: "Intestazione"
 displayOfSensitiveMedia: "Visibilità dei media espliciti"
 whenServerDisconnected: "Quando la connessione col server è persa"
-disconnectedFromServer: "Il server si è disconnesso"
+disconnectedFromServer: "Connessione persa"
 reload: "Ricarica"
-doNothing: "Nessun'azione"
+doNothing: "Ignora"
 reloadConfirm: "Vuoi ricaricare?"
 watch: "Osserva"
 unwatch: "Smetti di Osserva"
@@ -359,8 +362,8 @@ inMb: "in Megabytes"
 bannerUrl: "URL dell'immagine d'intestazione"
 backgroundImageUrl: "URL dello sfondo"
 basicInfo: "Informazioni fondamentali"
-pinnedUsers: "Utenti in evidenza"
-pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagina \"Esplora\", un@ per riga."
+pinnedUsers: "Profili in evidenza"
+pinnedUsersDescription: "Elenca i profili delle persone che vuoi fissare nella pagina \"Esplora\"."
 pinnedPages: "Pagine in evidenza"
 pinnedPagesDescription: "Specifica il percorso delle pagine che vuoi fissare in cima alla pagina dell'istanza. Una pagina per riga."
 pinnedClipId: "ID della Clip in evidenza"
@@ -388,7 +391,7 @@ antennaKeywordsDescription: "Sparando con uno spazio indichi la condizione E (an
 notifyAntenna: "Invia notifiche delle nuove note"
 withFileAntenna: "Solo note con file in allegato"
 enableServiceworker: "Abilita ServiceWorker"
-antennaUsersDescription: "Inserisci solo un nome utente per riga"
+antennaUsersDescription: "Elenca un nome utente per riga"
 caseSensitive: "Sensibile alla distinzione tra maiuscole e minuscole"
 withReplies: "Includere le risposte"
 connectedTo: "Connessione ai seguenti profili:"
@@ -398,11 +401,11 @@ silence: "Silenzia"
 silenceConfirm: "Vuoi davvero silenziare questo profilo?"
 unsilence: "Riattiva"
 unsilenceConfirm: "Vuoi davvero riattivare questo profilo?"
-popularUsers: "Utenti popolari"
+popularUsers: "Profili popolari"
 recentlyUpdatedUsers: "Utenti attivi di recente"
-recentlyRegisteredUsers: "Utenti registrati di recente"
-recentlyDiscoveredUsers: "Utenti scoperti di recente"
-exploreUsersCount: "Ci sono {count} utenti"
+recentlyRegisteredUsers: "Profili iscritti di recente"
+recentlyDiscoveredUsers: "Profili scoperti di recente"
+exploreUsersCount: "Ci sono {count} profili"
 exploreFediverse: "Esplora il Fediverso"
 popularTags: "Tag di tendenza"
 userList: "Liste"
@@ -412,8 +415,8 @@ administrator: "Amministratore"
 token: "Token"
 2fa: "Autenticazione a due fattori"
 setupOf2fa: "Impostare l'autenticazione a due fattori"
-totp: "App di autenticazione"
-totpDescription: "Inserisci un codice OTP tramite un'app di autenticazione"
+totp: "App di autenticazione a due fattori (2FA/MFA)"
+totpDescription: "Puoi autenticarti inserendo un codice OTP tramite la tua App di autenticazione a due fattori (2FA/MFA)"
 moderator: "Moderatore"
 moderation: "moderazione"
 moderationNote: "Promemoria di moderazione"
@@ -460,7 +463,7 @@ invitations: "Invita"
 invitationCode: "Codice di invito"
 checking: "Confermando"
 available: "Disponibile"
-unavailable: "Il nome utente è già in uso"
+unavailable: "Non puoi usarlo"
 usernameInvalidFormat: "Il nome utente deve avere solo caratteri alfanumerici e trattino basso '_'"
 tooShort: "Troppo breve"
 tooLong: "Troppo lungo"
@@ -531,6 +534,7 @@ serverLogs: "Log del server"
 deleteAll: "Cancella cronologia"
 showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
 showFixedPostFormInChannel: "Per i canali, mostra il modulo di pubblicazione in cima alla timeline"
+withRepliesByDefaultForNewlyFollowed: "Quando segui nuovi profili, includi le risposte in TL come impostazione predefinita"
 newNoteRecived: "Nuove note da leggere"
 sounds: "Impostazioni suoni"
 sound: "Suono"
@@ -559,13 +563,13 @@ scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScr
 output: "Uscita"
 script: "Script"
 disablePagesScript: "Disabilita AiScript nelle pagine"
-updateRemoteUser: "Aggiornare le informazioni di utente remot@"
+updateRemoteUser: "Aggiorna le informazioni dal profilo remoto"
 deleteAllFiles: "Elimina tutti i file"
 deleteAllFilesConfirm: "Vuoi davvero eliminare tutti i file?"
 removeAllFollowing: "Annulla tutti i follow"
 removeAllFollowingDescription: "Cancella tutti i follows del server {host}. Per favore, esegui se, ad esempio, l'istanza non esiste più."
 userSuspended: "L'utente è in sospensione"
-userSilenced: "L'utente è silenziat@."
+userSilenced: "Profilo silente."
 yourAccountSuspendedTitle: "Questo profilo è sospeso"
 yourAccountSuspendedDescription: "Questo profilo è stato sospeso a causa di una violazione del regolamento. Per informazioni, contattare l'amministrazione. Si prega di non creare un nuovo account."
 tokenRevoked: "Il token non è valido"
@@ -586,7 +590,7 @@ invisibleNote: "Nota invisibile"
 enableInfiniteScroll: "Abilita scorrimento infinito"
 visibility: "Visibilità"
 poll: "Sondaggio"
-useCw: "Content Warning"
+useCw: "Contenuto esplicito"
 enablePlayer: "Visualizza"
 disablePlayer: "Chiudi"
 expandTweet: "Espandi tweet"
@@ -649,7 +653,7 @@ notificationSetting: "Impostazioni notifiche"
 notificationSettingDesc: "Seleziona il tipo di notifiche da visualizzare."
 useGlobalSetting: "Usa impostazioni generali"
 useGlobalSettingDesc: "Quando attiva, verranno utilizzate le impostazioni notifiche del profilo. Altrimenti si possono segliere impostazioni personalizzate."
-other: "Avanzate"
+other: "Ulteriori"
 regenerateLoginToken: "Genera di nuovo un token di connessione"
 regenerateLoginTokenDescription: "Genera un nuovo token di autenticazione. Solitamente questa operazione non è necessaria: quando si genera un nuovo token, tutti i dispositivi vanno disconnessi."
 setMultipleBySeparatingWithSpace: "È possibile creare multiple voci separate da spazi."
@@ -737,8 +741,8 @@ reloadToApplySetting: "Le tue preferenze verranno impostate dopo il ricaricament
 needReloadToApply: "È necessario riavviare per rendere effettive le modifiche."
 showTitlebar: "Visualizza la barra del titolo"
 clearCache: "Svuota la cache"
-onlineUsersCount: "{n} utenti online"
-nUsers: "{n} utenti"
+onlineUsersCount: "{n} persone online"
+nUsers: "{n} profili"
 nNotes: "{n}Note"
 sendErrorReports: "Invia segnalazioni di errori"
 sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Misskey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
@@ -784,7 +788,7 @@ addDescription: "Aggiungi descrizione"
 userPagePinTip: "Qui puoi appuntare note, premendo \"Fissa sul profilo\" nel menù delle singole note."
 notSpecifiedMentionWarning: "Sono stati menzionati profili non inclusi fra i destinatari"
 info: "Informazioni"
-userInfo: "Informazioni utente"
+userInfo: "Informazioni sul profilo"
 unknown: "Sconosciuto"
 onlineStatus: "Stato di connessione"
 hideOnlineStatus: "Modalità invisibile"
@@ -804,8 +808,8 @@ user: "Profilo"
 administration: "Gestione"
 accounts: "Profilo"
 switch: "Cambia"
-noMaintainerInformationWarning: "Le informazioni amministratore non sono impostate."
-noBotProtectionWarning: "Nessuna protezione impostata contro i bot."
+noMaintainerInformationWarning: "Mancano le informazioni sull'amministratore."
+noBotProtectionWarning: "Non è stata impostata alcuna protezione dai Bot"
 configure: "Imposta"
 postToGallery: "Pubblicare nella galleria"
 postToHashtag: "Pubblica a questo hashtag"
@@ -843,13 +847,13 @@ accountDeletionInProgress: "È in corso l'eliminazione del profilo"
 usernameInfo: "Un nome per identificare univocamente il tuo profilo sull'istanza. Puoi utilizzare caratteri alfanumerici maiuscoli, minuscoli e il trattino basso (_). Non potrai cambiare nome utente in seguito."
 aiChanMode: "Modalità Ai"
 devMode: "Modalità sviluppatori"
-keepCw: "Mantieni il Content Warning"
+keepCw: "Mostra i contenuti espliciti"
 pubSub: "Publish/Subscribe del profilo"
 lastCommunication: "La comunicazione più recente"
 resolved: "Risolto"
 unresolved: "Non risolto"
 breakFollow: "Non farti più seguire"
-breakFollowConfirm: "Vuoi davvero smettere di seguire questo profilo?"
+breakFollowConfirm: "Vuoi davvero che questo profilo smetta di seguirti?"
 itsOn: "Abilitato"
 itsOff: "Disabilitato"
 on: "Acceso"
@@ -907,7 +911,7 @@ noEmailServerWarning: "Il server di posta non è configurato."
 thereIsUnresolvedAbuseReportWarning: "Ci sono report non evasi."
 recommended: "Consigliato"
 check: "Verifica"
-driveCapOverrideLabel: "Modificare il limite di spazio per questo utente"
+driveCapOverrideLabel: "Modificare la capienza del Drive per questo profilo"
 driveCapOverrideCaption: "Se viene specificato meno di 0, viene annullato."
 requireAdminForView: "Per visualizzarli, è necessario aver effettuato l'accesso con un profilo amministratore."
 isSystemAccount: "Questi profili vengono creati e gestiti automaticamente dal sistema"
@@ -975,6 +979,7 @@ assign: "Assegna"
 unassign: "Disassegna"
 color: "Colore"
 manageCustomEmojis: "Gestisci le emoji personalizzate"
+manageAvatarDecorations: "Gestire le decorazioni di foto del profilo"
 youCannotCreateAnymore: "Non puoi creare, hai raggiunto il limite."
 cannotPerformTemporary: "Indisponibilità temporanea"
 cannotPerformTemporaryDescription: "L'attività non può essere svolta, poiché si è raggiunto il limite di esecuzioni possibili. Per favore, riprova più tardi."
@@ -1128,13 +1133,31 @@ mutualFollow: "Follow reciproco"
 fileAttachedOnly: "Solo con allegati"
 showRepliesToOthersInTimeline: "Risposte altrui nella TL"
 hideRepliesToOthersInTimeline: "Nascondi Riposte altrui nella TL"
+showRepliesToOthersInTimelineAll: "Mostra le risposte dei tuoi follow nella TL"
+hideRepliesToOthersInTimelineAll: "Nascondi le risposte dei tuoi follow nella TL"
+confirmShowRepliesAll: "Questa è una attività irreversibile. Vuoi davvero includere tutte le risposte dei following in TL?"
+confirmHideRepliesAll: "Questa è una attività irreversibile. Vuoi davvero escludere tutte le risposte dei following in TL?"
 externalServices: "Servizi esterni"
 impressum: "Dichiarazione di proprietà"
 impressumUrl: "URL della dichiarazione di proprietà"
 impressumDescription: "La dichiarazione di proprietà, è obbligatoria in alcuni paesi come la Germania (Impressum)."
-privacyPolicy: "Informativa sulla privacy"
+privacyPolicy: "Informativa ai sensi del Reg. UE 2016/679 (GDPR)"
 privacyPolicyUrl: "URL della informativa privacy"
-tosAndPrivacyPolicy: "Condizioni d'uso e informativa sulla privacy"
+tosAndPrivacyPolicy: "Condizioni d'uso e informativa privacy"
+avatarDecorations: "Decorazioni foto profilo"
+attach: "Applica"
+detach: "Rimuovi"
+angle: "Angolo"
+flip: "Inverti"
+showAvatarDecorations: "Mostra decorazione della foto profilo"
+releaseToRefresh: "Rilascia per aggiornare"
+refreshing: "Aggiornamento..."
+pullDownToRefresh: "Trascina per aggiornare"
+disableStreamingTimeline: "Disabilitare gli aggiornamenti della TL in tempo reale"
+useGroupedNotifications: "Mostra le notifiche raggruppate"
+signupPendingError: "Si è verificato un problema durante la verifica del tuo indirizzo email. Potrebbe essere scaduto il collegamento temporaneo."
+cwNotationRequired: "Devi indicare perché il contenuto è indicato come esplicito."
+doReaction: "Reagisci"
 _announcement:
   forExistingUsers: "Solo ai profili attuali"
   forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio."
@@ -1144,6 +1167,10 @@ _announcement:
   tooManyActiveAnnouncementDescription: "L'esperienza delle persone può peggiorare se ci sono troppi annunci attivi. Considera anche l'archiviazione degli annunci conclusi."
   readConfirmTitle: "Segnare come già letto?"
   readConfirmText: "Hai già letto \"{title}˝?"
+  shouldNotBeUsedToPresentPermanentInfo: "Ti consigliamo di utilizzare gli annunci per pubblicare informazioni tempestive e limitate nel tempo, anziché informazioni importanti a lungo andare nel tempo, poiché potrebbero risultare difficili da ritrovare e peggiorare la fruibilità del servizio, specialmente alle nuove persone iscritte."
+  dialogAnnouncementUxWarn: "Ti consigliamo di usarli con cautela, poiché è molto probabile che avere più di un annuncio in stile \"finestra di dialogo\" peggiori sensibilmente la fruibilità del servizio, specialmente alle nuove persone iscritte."
+  silence: "Silenzia gli annunci"
+  silenceDescription: "Se attivi questa opzione, non riceverai notifiche sugli annunci, evitando di contrassegnarle come già lette."
 _initialAccountSetting:
   accountCreated: "Il tuo profilo è stato creato!"
   letsStartAccountSetup: "Per iniziare, impostiamo il tuo profilo."
@@ -1156,9 +1183,77 @@ _initialAccountSetting:
   pushNotificationDescription: "Attivare le notifiche push ti permettera di ricevere informazioni sulla attività di {name} direttamente sul tuo dispositivo."
   initialAccountSettingCompleted: "Hai completato la configurazione iniziale!"
   haveFun: "Divertiti con {name}!"
-  ifYouNeedLearnMore: "Per saperne di più su come usare {name} (Misskey), visita la pagina {link}"
+  youCanContinueTutorial: "Puoi continuare con l'esercitazione su come usare {name} (Misskey), oppure interrompere, iniziando subito a usarlo."
+  startTutorial: "Avvia l'esercitazione"
   skipAreYouSure: "Vuoi davvero saltare la configurazione iniziale?"
   laterAreYouSure: "Vuoi davvero rimandare la configurazione iniziale?"
+_initialTutorial:
+  launchTutorial: "Guarda il tutorial"
+  title: "Tutorial"
+  wellDone: "Ottimo lavoro!"
+  skipAreYouSure: "Vuoi davvero interrompere il tutorial?"
+  _landing:
+    title: "Eccoci nel tutorial"
+    description: "Qui puoi verificare l'uso delle funzionalità base di Misskey."
+  _note:
+    title: "Cosa sono le Note?"
+    description: "Gli status su Misskey sono chiamati \"Note\". Le Note sono elencate in ordine cronologico nelle timeline e vengono aggiornate in tempo reale."
+    reply: "Puoi rispondere alle Note. Puoi anche rispondere alle risposte e continuare i dialoghi come un conversazioni."
+    renote: "Puoi ri-condividere le Note, facendole rifluire sulla Timeline. Puoi anche aggiungere testo e citare altri profili."
+    reaction: "Puoi aggiungere una reazione. Nella pagina successiva spiegheremo i dettagli."
+    menu: "Puoi svolgere varie attività, come visualizzare i dettagli delle Note o copiare i collegamenti."
+  _reaction:
+    title: "Cosa sono le Reazioni?"
+    description: "Puoi reagire alle Note. Le sensazioni che non si riescono a trasmettere con i \"Mi piace\" si possono esprimere facilmente inviando una reazione."
+    letsTryReacting: "Puoi aggiungere una Reazione cliccando il bottone \"+\" (più) della relativa Nota. Prova ad aggiungerne una a questa Nota di esempio!"
+    reactToContinue: "Aggiungere la Reazione ti consentirà di procedere col tutorial."
+    reactNotification: "Quando qualcuno reagisce alle tue Note, ricevi una notifica in tempo reale."
+    reactDone: "Puoi annullare la tua Reazione premendo il bottone \"ー\" (meno)"
+  _timeline:
+    title: "Come funziona la Timeline"
+    description1: "Misskey fornisce alcune Timeline (sequenze cronologiche di Note). Una di queste potrebbe essere stata disattivata dagli amministratori."
+    home: "Puoi vedere le Note provenienti dai profili che segui (follow)."
+    local: "Puoi vedere tutte le Note pubblicate dai profili di questa istanza."
+    social: "Puoi vedere sia le Note della Timeline Home che quelle della Timeline Locale, insieme!"
+    global: "Puoi vedere le Note da pubblicate da tutte le altre istanze federate con la nostra."
+    description2: "Nella parte superiore dello schermo, puoi scegliere una Timeline o l'altra in qualsiasi momento."
+    description3: "Ci sono anche sequenze temporali di elenchi, sequenze temporali di canali, ecc. Per ulteriori dettagli, consultare il {link}.\nPuoi vedere anche Timeline delle liste di profili (se ne hai create), canali, ecc... Per i dettagli, visita {link}."
+  _postNote:
+    title: "La Nota e le sue impostazioni"
+    description1: "Quando scrivi una Nota su Misskey, hai a disposizione varie opzioni. Il modulo di invio è simile a questo."
+    _visibility:
+      description: "Puoi limitare chi può vedere la tua Nota."
+      public: "Visibile a tutti."
+      home: "Pubblicato solo sulla Timeline Home (personale). Visibile anche da profili remoti follower, visitatori del tuo profilo e tramite i Rinota dei follower."
+      followers: "Visibile solo ai profili tuoi follower (locali o remoti). Nessun altro oltre a te può \"Rinotare\"."
+      direct: "Visibile solo ai profili specificati, i quali riceveranno una notifica. Puoi usarlo come se fossero messaggi diretti."
+      doNotSendConfidencialOnDirect1: "Attenzione, quando si inviano informazioni confidenziali."
+      doNotSendConfidencialOnDirect2: "Poiché le Note non sono crittografate, l'amministratore del server di destinazione potrebbe leggere cosa è stato scritto, quindi se spedisci una Nota diretta a un profilo che risiede su un server non attendibile, evita di scrivere informazioni riservate."
+      localOnly: "Indipendentemente dalla visualizzazione sopra indicata, i profili su altri server non saranno in grado di visualizzare la Nota, se questa impostazione è attivata. Non non verrà comunicata ad altri server."
+    _cw:
+      title: "Nascondere il contenuto esplicito"
+      description: "Verrà visualizzato il testo scritto nel campo \"Annotazione preventiva\" al posto del testo principale della Nota. Premere il bottone \"Continua la lettura\" se si intende davvero leggere il testo."
+      _exampleNote:
+        cw: "Attenzione: contiene zuccheri"
+        note: "Ho appena mangiato una ciambella ricoperta di cioccolato 🍩😋"
+      useCases: "Utilizzalo per chiarire il contenuto della Nota, prima che sia letta. Come richiesto dal regolamento del server o per autoregolamentare spoiler e testi troppo espliciti."
+  _howToMakeAttachmentsSensitive:
+    title: "Come indicare che gli allegati sono espliciti?"
+    description: "Contrassegnare gli allegati come espliciti, va fatto quando è richiesto dal regolamento del server o quando gli allegati non devono essere immediatamente visibili."
+    tryThisFile: "Prova a rendere esplicite le immagini allegate a questo modulo!"
+    _exampleNote:
+      note: "Ho fatto un errore aprendo il coperchio del natto... (fagioli di soia fermentati, particolarmente appiccicosi)"
+    method: "Per indicare che un allegato è esplicito, tocca il file per aprirne il menu e scegliere la voce \"Segna come esplicito\"."
+    sensitiveSucceeded: "Quando alleghi file, assicurati di indicare se è materiale esplicito, in modo appropriato, in base al regolamento del tuo server."
+    doItToContinue: "Impostando l'immagine come esplicita, potrai procedere col tutorial."
+  _done:
+    title: "Il tutorial è finito! 🎉"
+    description: "Queste sono solamente alcune delle funzionalità principali di Misskey. Per ulteriori informazioni, {link}."
+_timelineDescription:
+  home: "Nella Timeline Home, la tua cronologia principale, puoi vedere le Note provenienti dai profili che segui (follow)."
+  local: "La Timeline Locale, è una cronologia di Note pubblicate da tutti i profili iscritti su questo server."
+  social: "La Timeline Sociale, unisce in ordine cronologico l'elenco di Note presenti nella Timeline Home e quella Locale."
+  global: "La Timeline Federata ti consente di vedere le Note pubblicate dai profili di tutti gli altri server federati a questo."
 _serverRules:
   description: "In Europa è necessario mostrare l'informativa sul trattamento dei dati personali, prima della registrazione al servizio."
 _serverSettings:
@@ -1170,6 +1265,7 @@ _serverSettings:
   manifestJsonOverride: "Sostituire il file manifest.json"
   shortName: "Abbreviazione"
   shortNameDescription: "Un'abbreviazione o un nome comune che può essere visualizzato al posto del nome ufficiale lungo del server."
+  fanoutTimelineDescription: "Attivando questa funzionalità migliori notevolmente la capacità delle Timeline di collezionare Note, riducendo il carico sul database. Tuttavia, aumenterà l'impiego di memoria RAM per Redis. Disattiva se il tuo server ha poca RAM o la funzionalità è irregolare."
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
   moveFromSub: "Crea un alias verso un altro profilo remoto"
@@ -1427,6 +1523,9 @@ _achievements:
     _smashTestNotificationButton:
       title: "Prove eccessive"
       description: "Hai provato le notifiche consecutivamente in un periodo di tempo molto breve"
+    _tutorialCompleted:
+      title: "Attestato di partecipazione al corso per principianti di Misskey"
+      description: "Ha completato il tutorial"
 _role:
   new: "Nuovo ruolo"
   edit: "Modifica ruolo"
@@ -1470,6 +1569,7 @@ _role:
     inviteLimitCycle: "Intervallo di emissione del codice di invito"
     inviteExpirationTime: "Scadenza del codice di invito"
     canManageCustomEmojis: "Gestire le emoji personalizzate"
+    canManageAvatarDecorations: "Gestisce le decorazioni di immagini del profilo"
     driveCapacity: "Capienza del Drive"
     alwaysMarkNsfw: "Impostare sempre come esplicito (NSFW)"
     pinMax: "Quantità massima di Note in primo piano"
@@ -1589,6 +1689,7 @@ _aboutMisskey:
   donate: "Sostieni Misskey"
   morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
   patrons: "Sostenitori"
+  projectMembers: "Partecipanti al progetto"
 _displayOfSensitiveMedia:
   respect: "Nascondere i media espliciti"
   ignore: "Non nascondere i media espliciti"
@@ -1606,13 +1707,14 @@ _channel:
   edit: "Gerisci canale"
   setBanner: "Scegli intestazione"
   removeBanner: "Rimuovi intestazione"
-  featured: "Tendenze"
+  featured: "Di tendenza"
   owned: "I miei canali"
   following: "Seguiti"
   usersCount: "{n} partecipanti"
   notesCount: "{n} note"
   nameAndDescription: "Nome e descrizione"
   nameOnly: "Solo il nome"
+  allowRenoteToExternal: "Consenti i Rinota e le citazioni all'esterno del canale"
 _menuDisplay:
   sideFull: "Laterale"
   sideIcon: "Laterale (solo icone)"
@@ -1720,26 +1822,16 @@ _time:
   minute: "min"
   hour: "ore"
   day: "giorni"
-_timelineTutorial:
-  title: "Come usare Misskey"
-  step1_1: "Questa è la \"Timeline\". tutte le \"Note\" pubblicate su {name} vengono elencate in ordine cronologico."
-  step1_2: "Le Timeline sono diverse, ad esempio, la \"Home\" elenca le Note dei profili che segui. Quella \"Locale\" elenca quelle di tutti i profili attivi su {name}."
-  step2_1: "Prova a pubblicare una Nota. Semplicemente premendo il bottone con l'icona di una matita."
-  step2_2: "Potresti scrivere la tua presentazione, oppure semplicemente \"Ciao da {name}!\""
-  step3_1: "Hai pubblicato qualcosa?"
-  step3_2: "In tal caso, dovrebbe comparire subito nella tua \"Home\""
-  step4_1: "Puoi reagire con un emoji alle Note."
-  step4_2: "To attach a reaction, press the \"+\" mark on a note and choose an emoji you'd like to react with.\nPer reagire con una emoji, premi il bottone \"+\" (più) visibile vicino ad ogni Nota e scegli dall'elenco la emoji che rappresenta la tua reazione."
 _2fa:
   alreadyRegistered: "La configurazione è stata già completata."
-  registerTOTP: "Registra un'app di autenticazione"
-  step1: "Innanzitutto, installare sul dispositivo un'applicazione di autenticazione come {a} o {b}."
-  step2: "Quindi, scansionare il codice QR visualizzato con l'app."
+  registerTOTP: "Registra una App di autenticazione a due fattori (2FA/MFA)"
+  step1: "Innanzitutto, installa sul dispositivo un'App di autenticazione come {a} o {b}."
+  step2: "Quindi, tramite la App installata, scansiona questo codice QR."
   step2Click: "Cliccando sul codice QR, puoi registrarlo con l'app di autenticazione o il portachiavi installato sul tuo dispositivo."
   step2Uri: "Inserisci il seguente URL se desideri utilizzare una App per PC"
   step3Title: "Inserisci il codice di verifica"
   step3: "Inserite il token visualizzato nell'app e il gioco è fatto."
-  setupCompleted: "Impostazione completata"
+  setupCompleted: "Impostazione completata! 🎉"
   step4: "D'ora in poi, quando si accede, si inserisce il token nello stesso modo."
   securityKeyNotSupported: "Il tuo browser non supporta le chiavi di sicurezza."
   registerTOTPBeforeKey: "Ti occorre un'app di autenticazione con OTP, prima di registrare la chiave di sicurezza."
@@ -1784,8 +1876,8 @@ _permissions:
   "write:pages": "Gestire pagine"
   "read:page-likes": "Visualizzare i \"Mi piace\" di pagine"
   "write:page-likes": "Gestire i \"Mi piace\" di pagine"
-  "read:user-groups": "Vedi gruppi di utenti"
-  "write:user-groups": "Gestisci gruppi di utenti"
+  "read:user-groups": "Vedere i gruppi di utenti"
+  "write:user-groups": "Gestire i gruppi di utenti"
   "read:channels": "Visualizza canali"
   "write:channels": "Gerisci canali"
   "read:gallery": "Visualizza la galleria."
@@ -1827,20 +1919,20 @@ _widgets:
   notifications: "Notifiche"
   timeline: "Timeline"
   calendar: "Calendario"
-  trends: "Tendenze"
+  trends: "Di tendenza"
   clock: "Orologio"
-  rss: "Aggregatore rss"
-  rssTicker: "Ticker RSS"
+  rss: "Lettura RSS"
+  rssTicker: "Nastro RSS"
   activity: "Attività"
   photos: "Foto"
   digitalClock: "Orologio digitale"
   unixClock: "Orologio UNIX"
   federation: "Federazione"
-  instanceCloud: "Istanza Cloud"
+  instanceCloud: "Nuvola di federazione"
   postForm: "Finestra di pubblicazione"
   slideshow: "Diapositive"
   button: "Pulsante"
-  onlineUsers: "Utenti online"
+  onlineUsers: "Persone online"
   jobQueue: "Coda di lavoro"
   serverMetric: "Statistiche server"
   aiscript: "Console AiScript"
@@ -1852,7 +1944,7 @@ _widgets:
   clicker: "Cliccaggio"
 _cw:
   hide: "Nascondere"
-  show: "Apri..."
+  show: "Continua la lettura..."
   chars: "{count} caratteri"
   files: "{count} file"
 _poll:
@@ -1879,9 +1971,9 @@ _poll:
   remainingSeconds: "Rimangono {s} secondi"
 _visibility:
   public: "Pubblica"
-  publicDescription: "Visibile per tutti sul Fediverso"
+  publicDescription: "Visibilità pubblica"
   home: "Home"
-  homeDescription: "Visibile solo sulla timeline locale"
+  homeDescription: "Visibile solo nella Home"
   followers: "Follower"
   followersDescription: "Visibile solo ai tuoi follower"
   specified: "Nota diretta"
@@ -1921,6 +2013,7 @@ _exportOrImport:
   userLists: "Liste"
   excludeMutingUsers: "Escludere gli utenti silenziati"
   excludeInactiveUsers: "Escludere i profili inutilizzati"
+  withReplies: "Includere le risposte da profili importati nella Timeline"
 _charts:
   federation: "Federazione"
   apRequest: "Richieste"
@@ -1937,7 +2030,7 @@ _charts:
   storageUsageTotal: "Utilizzo totale dell'immagazzinamento"
 _instanceCharts:
   requests: "Richieste"
-  users: "Variazione del numero di utenti"
+  users: "Variazione del numero di profili"
   usersTotal: "Totale cumulativo di utenti"
   notes: "Variazione del numero di note"
   notesTotal: "Totale cumulato di note"
@@ -1998,8 +2091,8 @@ _pages:
   font: "Tipo di carattere"
   fontSerif: "Serif"
   fontSansSerif: "Sans serif"
-  eyeCatchingImageSet: "Imposta un'immagine attrattiva"
-  eyeCatchingImageRemove: "Elimina l'anteprima immagine"
+  eyeCatchingImageSet: "Imposta un'immagine attraente"
+  eyeCatchingImageRemove: "Elimina immagine attraente"
   chooseBlock: "Aggiungi blocco"
   selectType: "Seleziona tipo"
   contentBlocks: "Contenuto"
@@ -2038,6 +2131,9 @@ _notification:
   checkNotificationBehavior: "Prova il comportamento della notifica"
   sendTestNotification: "Spedisci una notifica di prova"
   notificationWillBeDisplayedLikeThis: "La notifica apparirà così"
+  reactedBySomeUsers: "{n} reazioni"
+  renotedBySomeUsers: "{n} Rinota"
+  followedBySomeUsers: "{n} nuovi follower"
   _types:
     all: "Tutto"
     note: "Nuove Note"
@@ -2085,7 +2181,7 @@ _deck:
     list: "Liste"
     channel: "Canale"
     mentions: "Menzioni"
-    direct: "Diretta"
+    direct: "Note Dirette"
     roleTimeline: "Timeline Ruolo"
 _dialog:
   charactersExceeded: "Hai superato il limite di {max} caratteri! ({corrente})"
@@ -2141,3 +2237,55 @@ _moderationLogTypes:
   createAd: "Banner creato"
   deleteAd: "Banner eliminato"
   updateAd: "Banner aggiornato"
+  createAvatarDecoration: "Creazione decorazione della foto profilo"
+  updateAvatarDecoration: "Aggiornamento decorazione foto profilo"
+  deleteAvatarDecoration: "Eliminazione decorazione della foto profilo"
+_fileViewer:
+  title: "Dettagli del file"
+  type: "Tipo di file"
+  size: "Dimensioni file"
+  url: "URL"
+  uploadedAt: "Caricato il"
+  attachedNotes: "Note a cui è allegato"
+  thisPageCanBeSeenFromTheAuthor: "Questa pagina può essere vista solo da chi ha caricato il file."
+_externalResourceInstaller:
+  title: "Installa da sito esterno"
+  checkVendorBeforeInstall: "Prima di installare, assicurati che la fonte sia affidabile."
+  _plugin:
+    title: "Vuoi davvero installare questo componente aggiuntivo?"
+    metaTitle: "Informazioni sul componente aggiuntivo"
+  _theme:
+    title: "Vuoi davvero installare questa variazione grafica?"
+    metaTitle: "Informazioni sulla variazione grafica"
+  _meta:
+    base: "Combinazione base di colori"
+  _vendorInfo:
+    title: "Informazioni sulla fonte"
+    endpoint: "Punto di riferimento della fonte"
+    hashVerify: "Codice di verifica della fonte"
+  _errors:
+    _invalidParams:
+      title: "Parametri non validi"
+      description: "Mancano alcuni parametri per il caricamento, per favore, verifica la URL."
+    _resourceTypeNotSupported:
+      title: "Questa risorsa esterna non è supportata"
+      description: "Il tipo di risorsa ottenuta da questo sito esterno non è supportato. Si prega di contattare la fonte di distribuizone."
+    _failedToFetch:
+      title: "Impossibile ottenere i dati"
+      fetchErrorDescription: "Si è verificato un errore di comunicazione con la fonte. Se riprovare di nuovo non aiuta, contattare la fonte di distribuzione."
+      parseErrorDescription: "Si è verificato un errore elaborando i dati ottenuti dalla fonte. Per favore contattare il distributore."
+    _hashUnmatched:
+      title: "Dati non verificabili, diversi da quelli della fonte"
+      description: "Si è verificato un errore durante la verifica di integrità dei dati ottenuti. Per sicurezza, l'installazione è stata interrotta. Contattare la fonte di distribuzione."
+    _pluginParseFailed:
+      title: "Errore AiScript"
+      description: "Sebbene i dati ottenuti siano validi, non è stato possibile interpretarli, perché si è verificato un errore durante l'analisi di AiScript. Si prega di contattare gli autori del componente aggiuntivo. Potresti controllare la console di Javascript per ottenere dettagli aggiuntivi."
+    _pluginInstallFailed:
+      title: "Impossibile installare il componente aggiuntivo"
+      description: "Si è verificato un impedimento durante l'installazione del componente aggiuntivo. Per favore riprova e consulta la console di Javascript per ottenere dettagli aggiuntivi."
+    _themeParseFailed:
+      title: "Impossibile interpretare la variazione grafica"
+      description: "Sebbene i dati siano stati ottenuti, non è stato possibile interpretarli, si è verificato un errore durante l'analisi della variazione grafica. Si prega di contattare gli autori. Potresti anche controllare la console di Javascript per ottenere dettagli aggiuntivi."
+    _themeInstallFailed:
+      title: "Impossibile installare la variazione grafica"
+      description: "Si è verificato un impedimento durante l'installazione della variazione grafica. Per favore riprova e consulta la console di Javascript per ottenere dettagli aggiuntivi."

locales/ja-JP.yml

@@ -261,6 +261,7 @@ removed: "削除しました"
 removeAreYouSure: "「{x}」を削除しますか？"
 deleteAreYouSure: "「{x}」を削除しますか？"
 resetAreYouSure: "リセットしますか？"
+areYouSure: "よろしいですか？"
 saved: "保存しました"
 messaging: "チャット"
 upload: "アップロード"
@@ -311,6 +312,7 @@ folderName: "フォルダー名"
 createFolder: "フォルダーを作成"
 renameFolder: "フォルダー名を変更"
 deleteFolder: "フォルダーを削除"
+folder: "フォルダー"
 addFile: "ファイルを追加"
 emptyDrive: "ドライブは空です"
 emptyFolder: "フォルダーは空です"
@@ -437,7 +439,6 @@ share: "共有"
 notFound: "見つかりません"
 notFoundDescription: "指定されたURLに該当するページはありませんでした。"
 uploadFolder: "既定アップロード先"
-cacheClear: "キャッシュを削除"
 markAsReadAllNotifications: "すべての通知を既読にする"
 markAsReadAllUnreadNotes: "すべての投稿を既読にする"
 markAsReadAllTalkMessages: "すべてのチャットを既読にする"
@@ -544,6 +545,8 @@ showInPage: "ページで表示"
 popout: "ポップアウト"
 volume: "音量"
 masterVolume: "マスター音量"
+notUseSound: "サウンドを出力しない"
+useSoundOnlyWhenActive: "Misskeyがアクティブな時のみサウンドを出力する"
 details: "詳細"
 chooseEmoji: "絵文字を選択"
 unableToProcess: "操作を完了できません"
@@ -564,6 +567,10 @@ output: "出力"
 script: "スクリプト"
 disablePagesScript: "Pagesのスクリプトを無効にする"
 updateRemoteUser: "リモートユーザー情報の更新"
+unsetUserAvatar: "アイコンを解除"
+unsetUserAvatarConfirm: "アイコンを解除しますか？"
+unsetUserBanner: "バナーを解除"
+unsetUserBannerConfirm: "バナーを解除しますか？"
 deleteAllFiles: "すべてのファイルを削除"
 deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
 removeAllFollowing: "フォローを全解除"
@@ -635,6 +642,7 @@ smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
 smtpSecureInfo: "STARTTLS使用時はオフにします。"
 testEmail: "配信テスト"
 wordMute: "ワードミュート"
+hardWordMute: "ハードワードミュート"
 regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
 instanceMute: "サーバーミュート"
@@ -979,6 +987,7 @@ assign: "アサイン"
 unassign: "アサインを解除"
 color: "色"
 manageCustomEmojis: "カスタム絵文字の管理"
+manageAvatarDecorations: "アバターデコレーションの管理"
 youCannotCreateAnymore: "これ以上作成することはできません。"
 cannotPerformTemporary: "一時的に利用できません"
 cannotPerformTemporaryDescription: "操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。"
@@ -1019,6 +1028,8 @@ resetPasswordConfirm: "パスワードリセットしますか？"
 sensitiveWords: "センシティブワード"
 sensitiveWordsDescription: "設定したワードが含まれるノートの公開範囲をホームにします。改行で区切って複数設定できます。"
 sensitiveWordsDescription2: "スペースで区切るとAND指定になり、キーワードをスラッシュで囲むと正規表現になります。"
+hiddenTags: "非表示ハッシュタグ"
+hiddenTagsDescription: "設定したタグをトレンドに表示させないようにします。改行で区切って複数設定できます。"
 notesSearchNotAvailable: "ノート検索は利用できません。"
 license: "ライセンス"
 unfavoriteConfirm: "お気に入り解除しますか？"
@@ -1031,6 +1042,7 @@ enableChartsForRemoteUser: "リモートユーザーのチャートを生成"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを生成"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 reactionsDisplaySize: "リアクションの表示サイズ"
+limitWidthOfReaction: "リアクションの最大横幅を制限し、縮小して表示する"
 noteIdOrUrl: "ノートIDまたはURL"
 video: "動画"
 videos: "動画"
@@ -1132,6 +1144,10 @@ mutualFollow: "相互フォロー"
 fileAttachedOnly: "ファイル付きのみ"
 showRepliesToOthersInTimeline: "TLに他の人への返信を含める"
 hideRepliesToOthersInTimeline: "TLに他の人への返信を含めない"
+showRepliesToOthersInTimelineAll: "TLに現在フォロー中の人全員の返信を含めるようにする"
+hideRepliesToOthersInTimelineAll: "TLに現在フォロー中の人全員の返信を含めないようにする"
+confirmShowRepliesAll: "この操作は元に戻せません。本当にTLに現在フォロー中の人全員の返信を含めるようにしますか？"
+confirmHideRepliesAll: "この操作は元に戻せません。本当にTLに現在フォロー中の人全員の返信を含めないようにしますか？"
 externalServices: "外部サービス"
 impressum: "運営者情報"
 impressumUrl: "運営者情報URL"
@@ -1139,6 +1155,24 @@ impressumDescription: "ドイツなどの一部の国と地域では表示が義
 privacyPolicy: "プライバシーポリシー"
 privacyPolicyUrl: "プライバシーポリシーURL"
 tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
+avatarDecorations: "アイコンデコレーション"
+attach: "付ける"
+detach: "外す"
+detachAll: "全て外す"
+angle: "角度"
+flip: "反転"
+showAvatarDecorations: "アイコンのデコレーションを表示"
+releaseToRefresh: "離してリロード"
+refreshing: "リロード中"
+pullDownToRefresh: "引っ張ってリロード"
+disableStreamingTimeline: "タイムラインのリアルタイム更新を無効にする"
+useGroupedNotifications: "通知をグルーピングして表示する"
+signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
+cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
+doReaction: "リアクションする"
+code: "コード"
+reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
+remainingN: "残り: {n}"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"
@@ -1149,10 +1183,14 @@ _announcement:
   tooManyActiveAnnouncementDescription: "アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討してください。"
   readConfirmTitle: "既読にしますか？"
   readConfirmText: "「{title}」の内容を読み、既読にします。"
+  shouldNotBeUsedToPresentPermanentInfo: "特に新規ユーザーのUXを損ねる可能性が高いため、ストック情報ではなくフロー情報の掲示にお知らせを使用することを推奨します。"
+  dialogAnnouncementUxWarn: "ダイアログ形式のお知らせが同時に2つ以上ある場合、UXに悪影響を及ぼす可能性が非常に高いため、使用は慎重に行うことを推奨します。"
+  silence: "非通知"
+  silenceDescription: "オンにすると、このお知らせは通知されず、既読にする必要もなくなります。"
 
 _initialAccountSetting:
   accountCreated: "アカウントの作成が完了しました！"
-  letsStartAccountSetup: "アカウントの初期設定を行いましょう。"
+  letsStartAccountSetup: "さっそくアカウントの初期設定を行いましょう。"
   letsFillYourProfile: "まずはあなたのプロフィールを設定しましょう。"
   profileSetting: "プロフィール設定"
   privacySetting: "プライバシー設定"
@@ -1162,10 +1200,80 @@ _initialAccountSetting:
   pushNotificationDescription: "プッシュ通知を有効にすると{name}の通知をお使いのデバイスで受け取ることができます。"
   initialAccountSettingCompleted: "初期設定が完了しました！"
   haveFun: "{name}をお楽しみください！"
-  ifYouNeedLearnMore: "{name}(Misskey)の使い方などを詳しく知るには{link}をご覧ください。"
+  youCanContinueTutorial: "このまま{name}(Misskey)の使い方についてのチュートリアルに進むこともできますが、ここで中断してすぐに使い始めることもできます。"
+  startTutorial: "チュートリアルを開始"
   skipAreYouSure: "初期設定をスキップしますか？"
   laterAreYouSure: "初期設定をあとでやり直しますか？"
 
+_initialTutorial:
+  launchTutorial: "チュートリアルを見る"
+  title: "チュートリアル"
+  wellDone: "よくできました"
+  skipAreYouSure: "チュートリアルを終了しますか？"
+  _landing:
+    title: "チュートリアルへようこそ"
+    description: "ここでは、Misskeyの基本的な使い方や機能を確認できます。"
+  _note:
+    title: "ノートって何？"
+    description: "Misskeyでの投稿は「ノート」と呼びます。ノートはタイムラインに時系列で並んでいて、リアルタイムで更新されていきます。"
+    reply: "返信することができます。返信に対しての返信も可能で、スレッドのように会話を続けることもできます。"
+    renote: "そのノートを自分のタイムラインに流して共有することができます。テキストを追加して引用することも可能です。"
+    reaction: "リアクションをつけることができます。詳しくは次のページで解説します。"
+    menu: "ノートの詳細を表示したり、リンクをコピーしたりなどの様々な操作が行えます。"
+  _reaction:
+    title: "リアクションって何？"
+    description: "ノートには「リアクション」をつけることができます。「いいね」では伝わらないニュアンスも、リアクションで簡単・気軽に表現できます。"
+    letsTryReacting: "リアクションは、ノートの「＋」ボタンをクリックするとつけられます。試しにこのサンプルのノートにリアクションをつけてみてください！"
+    reactToContinue: "リアクションをつけると先に進めるようになります。"
+    reactNotification: "あなたのノートが誰かにリアクションされると、リアルタイムで通知を受け取ります。"
+    reactDone: "「ー」ボタンを押すとリアクションを取り消すことができます。"
+  _timeline:
+    title: "タイムラインのしくみ"
+    description1: "Misskeyには、使い方に応じて複数のタイムラインが用意されています（サーバーによってはいずれかが無効になっていることがあります）。"
+    home: "あなたがフォローしているアカウントの投稿を見られます。"
+    local: "このサーバーにいるユーザー全員の投稿を見られます。"
+    social: "ホームタイムラインとローカルタイムラインの投稿が両方表示されます。"
+    global: "接続している他のすべてのサーバーからの投稿を見られます。"
+    description2: "それぞれのタイムラインは、画面上部でいつでも切り替えられます。"
+    description3: "その他にも、リストタイムラインやチャンネルタイムラインなどがあります。詳しくは{link}をご覧ください。"
+  _postNote:
+    title: "ノートの投稿設定"
+    description1: "Misskeyにノートを投稿する際には、様々なオプションの設定が可能です。投稿フォームはこのようになっています。"
+    _visibility:
+      description: "ノートを表示できる相手を制限できます。"
+      public: "すべてのユーザーに公開。"
+      home: "ホームタイムラインのみに公開。フォロワー・プロフィールを見に来た人・リノートから、他のユーザーも見ることができます。"
+      followers: "フォロワーにのみ公開。本人以外がリノートすることはできず、またフォロワー以外は閲覧できません。"
+      direct: "指定したユーザーにのみ公開され、また相手に通知が入ります。ダイレクトメッセージのかわりにお使いいただけます。"
+      doNotSendConfidencialOnDirect1: "機密情報は送信する際は注意してください。"
+      doNotSendConfidencialOnDirect2: "送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーにダイレクト投稿を送信する場合は、機密情報の扱いに注意が必要です。"
+      localOnly: "他のサーバーに投稿を連合しません。上記の公開範囲に関わらず、他のサーバーのユーザーは、この設定がついたノートを直接閲覧することができなくなります。"
+    _cw:
+      title: "内容を隠す（CW）"
+      description: "本文のかわりに「注釈」に書いた内容が表示されます。「もっと見る」を押すと本文が表示されます。"
+      _exampleNote:
+        cw: "飯テロ注意"
+        note: "チョコのかかったドーナツを食べました🍩😋"
+      useCases: "サーバーのガイドラインにより必要とされるノートに指定したり、ネタバレ投稿やセンシティブな文章を自主規制したりするときに使います。"
+  _howToMakeAttachmentsSensitive:
+    title: "添付ファイルをセンシティブにするには？"
+    description: "サーバーのガイドラインにより必要とされる際や、そのまま見れる状態にしておくべきではない添付ファイルには、「センシティブ」設定を付けます。"
+    tryThisFile: "試しに、このフォームに添付された画像をセンシティブにしてみてください！"
+    _exampleNote:
+      note: "納豆のフタ開けるのミスったわね…"
+    method: "添付ファイルをセンシティブにする際は、そのファイルをクリックしてメニューを開き、「センシティブとして設定」をクリックします。"
+    sensitiveSucceeded: "ファイルを添付する際は、サーバーのガイドラインに従ってセンシティブを適切に設定してください。"
+    doItToContinue: "画像をセンシティブに設定すると先に進めるようになります。"
+  _done:
+    title: "チュートリアルは終了です🎉"
+    description: "ここで紹介した機能はほんの一部にすぎません。Misskeyの使い方をより詳しく知るには、{link}をご覧ください。"
+
+_timelineDescription:
+  home: "ホームタイムラインでは、あなたがフォローしているアカウントの投稿を見られます。"
+  local: "ローカルタイムラインでは、このサーバーにいるユーザー全員の投稿を見られます。"
+  social: "ソーシャルタイムラインには、ホームタイムラインとローカルタイムラインの投稿が両方表示されます。"
+  global: "グローバルタイムラインでは、接続している他のすべてのサーバーからの投稿を見られます。"
+
 _serverRules:
   description: "新規登録前に表示する、サーバーの簡潔なルールを設定します。内容は利用規約の要約とすることを推奨します。"
 
@@ -1178,6 +1286,9 @@ _serverSettings:
   manifestJsonOverride: "manifest.jsonのオーバーライド"
   shortName: "略称"
   shortNameDescription: "サーバーの正式名称が長い場合に、代わりに表示することのできる略称や通称。"
+  fanoutTimelineDescription: "有効にすると、各種タイムラインを取得する際のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。サーバーのメモリ容量が少ない場合、または動作が不安定な場合は無効にすることができます。"
+  fanoutTimelineDbFallback: "データベースへのフォールバック"
+  fanoutTimelineDbFallbackDescription: "有効にすると、タイムラインがキャッシュされていない場合にDBへ追加で問い合わせを行うフォールバック処理を行います。無効にすると、フォールバック処理を行わないことでさらにサーバーの負荷を軽減することができますが、タイムラインが取得できる範囲に制限が生じます。"
 
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに移行"
@@ -1437,6 +1548,9 @@ _achievements:
     _smashTestNotificationButton:
       title: "テスト過剰"
       description: "通知のテストをごく短時間のうちに連続して行った"
+    _tutorialCompleted:
+      title: "Misskey初心者講座 修了証"
+      description: "チュートリアルを完了した"
 
 _role:
   new: "ロールの作成"
@@ -1448,7 +1562,9 @@ _role:
   assignTarget: "アサイン"
   descriptionOfAssignTarget: "<b>マニュアル</b>は誰がこのロールに含まれるかを手動で管理します。\n<b>コンディショナル</b>は条件を設定し、それに合致するユーザーが自動で含まれるようになります。"
   manual: "マニュアル"
+  manualRoles: "マニュアルロール"
   conditional: "コンディショナル"
+  conditionalRoles: "コンディショナルロール"
   condition: "条件"
   isConditionalRole: "これはコンディショナルロールです。"
   isPublic: "公開ロール"
@@ -1481,6 +1597,7 @@ _role:
     inviteLimitCycle: "招待コードの発行間隔"
     inviteExpirationTime: "招待コードの有効期限"
     canManageCustomEmojis: "カスタム絵文字の管理"
+    canManageAvatarDecorations: "アバターデコレーションの管理"
     driveCapacity: "ドライブ容量"
     alwaysMarkNsfw: "ファイルにNSFWを常に付与"
     pinMax: "ノートのピン留めの最大数"
@@ -1496,6 +1613,7 @@ _role:
     canHideAds: "広告の非表示"
     canSearchNotes: "ノート検索の利用"
     canUseTranslator: "翻訳機能の利用"
+    avatarDecorationLimit: "アイコンデコレーションの最大取付個数"
   _condition:
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
@@ -1535,7 +1653,7 @@ _ffVisibility:
 _signup:
   almostThere: "ほとんど完了です"
   emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
-  emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"
+  emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。メールに記載されているリンクの有効期限は30分です。"
 
 _accountDelete:
   accountDelete: "アカウントの削除"
@@ -1606,13 +1724,14 @@ _registry:
 
 _aboutMisskey:
   about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
-  contributors: "主なコントリビューター"
+  contributors: "コントリビューター"
   allContributors: "全てのコントリビューター"
   source: "ソースコード"
   translation: "Misskeyを翻訳"
   donate: "Misskeyに寄付"
   morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
   patrons: "支援者"
+  projectMembers: "プロジェクトメンバー"
 
 _displayOfSensitiveMedia:
   respect: "センシティブ設定されたメディアを隠す"
@@ -1641,6 +1760,7 @@ _channel:
   notesCount: "{n}投稿があります"
   nameAndDescription: "名前と説明"
   nameOnly: "名前のみ"
+  allowRenoteToExternal: "チャンネル外へのリノートと引用リノートを許可する"
 
 _menuDisplay:
   sideFull: "横"
@@ -1738,6 +1858,15 @@ _sfx:
   notification: "通知"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
+  reaction: "リアクション選択時"
+
+_soundSettings:
+  driveFile: "ドライブの音声を使用"
+  driveFileWarn: "ドライブのファイルを選択してください"
+  driveFileTypeWarn: "このファイルは対応していません"
+  driveFileTypeWarnDescription: "音声ファイルを選択してください"
+  driveFileDurationWarn: "音声が長すぎます"
+  driveFileDurationWarnDescription: "長い音声を使用するとMisskeyの使用に支障をきたす可能性があります。それでも続行しますか？"
 
 _ago:
   future: "未来"
@@ -1749,7 +1878,16 @@ _ago:
   weeksAgo: "{n}週間前"
   monthsAgo: "{n}ヶ月前"
   yearsAgo: "{n}年前"
-  invalid: "ありません"
+  invalid: "日時の解析に失敗"
+
+_timeIn:
+  seconds: "{n}秒後"
+  minutes: "{n}分後"
+  hours: "{n}時間後"
+  days: "{n}日後"
+  weeks: "{n}週間後"
+  months: "{n}ヶ月後"
+  years: "{n}年後"
 
 _time:
   second: "秒"
@@ -1757,17 +1895,6 @@ _time:
   hour: "時間"
   day: "日"
 
-_timelineTutorial:
-  title: "Misskeyの使い方"
-  step1_1: "この画面は「タイムライン」です。{name}に投稿された「ノート」が時系列で表示されます。"
-  step1_2: "タイムラインにはいくつか種類があり、例えば「ホームタイムライン」にはあなたがフォローしている人のノートが流れ、「ローカルタイムライン」には{name}全体のノートが流れます。"
-  step2_1: "試しに、何かノートを投稿してみましょう。画面上にある鉛筆マークのボタンを押すとフォームが開きます。"
-  step2_2: "初めてのノートの内容は、あなたの自己紹介や「{name}始めました」などがおすすめです。"
-  step3_1: "投稿できましたか？"
-  step3_2: "あなたのノートがタイムラインに表示されていれば成功です。"
-  step4_1: "ノートには、「リアクション」を付けることができます。"
-  step4_2: "リアクションを付けるには、ノートの「+」マークをクリックして、好きな絵文字を選択します。"
-
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"
   registerTOTP: "認証アプリの設定を開始"
@@ -1893,6 +2020,7 @@ _widgets:
   _userList:
     chooseList: "リストを選択"
   clicker: "クリッカー"
+  birthdayFollowings: "今日誕生日のユーザー"
 
 _cw:
   hide: "隠す"
@@ -1960,6 +2088,7 @@ _profile:
   changeAvatar: "アイコン画像を変更"
   changeBanner: "バナー画像を変更"
   verifiedLinkDescription: "内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。"
+  avatarDecorationMax: "最大{max}つまでデコレーションを付けられます。"
 
 _exportOrImport:
   allNotes: "全てのノート"
@@ -2096,6 +2225,9 @@ _notification:
   checkNotificationBehavior: "通知の表示を確かめる"
   sendTestNotification: "テスト通知を送信する"
   notificationWillBeDisplayedLikeThis: "通知はこのように表示されます"
+  reactedBySomeUsers: "{n}人がリアクションしました"
+  renotedBySomeUsers: "{n}人がリノートしました"
+  followedBySomeUsers: "{n}人にフォローされました"
 
   _types:
     all: "すべて"
@@ -2208,6 +2340,11 @@ _moderationLogTypes:
   createAd: "広告を作成"
   deleteAd: "広告を削除"
   updateAd: "広告を更新"
+  createAvatarDecoration: "アイコンデコレーションを作成"
+  updateAvatarDecoration: "アイコンデコレーションを更新"
+  deleteAvatarDecoration: "アイコンデコレーションを削除"
+  unsetUserAvatar: "ユーザーのアイコンを解除"
+  unsetUserBanner: "ユーザーのバナーを解除"
 
 _fileViewer:
   title: "ファイルの詳細"
@@ -2217,3 +2354,59 @@ _fileViewer:
   uploadedAt: "追加日"
   attachedNotes: "添付されているノート"
   thisPageCanBeSeenFromTheAuthor: "このページは、このファイルをアップロードしたユーザーしか閲覧できません。"
+
+_externalResourceInstaller:
+  title: "外部サイトからインストール"
+  checkVendorBeforeInstall: "配布元が信頼できるかを確認した上でインストールしてください。"
+  _plugin:
+    title: "このプラグインをインストールしますか？"
+    metaTitle: "プラグイン情報"
+  _theme:
+    title: "このテーマをインストールしますか？"
+    metaTitle: "テーマ情報"
+  _meta:
+    base: "基本のカラースキーム"
+  _vendorInfo:
+    title: "配布元情報"
+    endpoint: "参照したエンドポイント"
+    hashVerify: "ファイル整合性の確認"
+  _errors:
+    _invalidParams:
+      title: "パラメータが不足しています"
+      description: "外部サイトからデータを取得するために必要な情報が不足しています。URLをお確かめください。"
+    _resourceTypeNotSupported:
+      title: "この外部リソースには対応していません"
+      description: "この外部サイトから取得したリソースの種別には対応していません。サイト管理者にお問い合わせください。"
+    _failedToFetch:
+      title: "データの取得に失敗しました"
+      fetchErrorDescription: "外部サイトとの通信に失敗しました。もう一度試しても改善しない場合、サイト管理者にお問い合わせください。"
+      parseErrorDescription: "外部サイトから取得したデータが読み取れませんでした。サイト管理者にお問い合わせください。"
+    _hashUnmatched:
+      title: "正しいデータが取得できませんでした"
+      description: "提供されたデータの整合性の確認に失敗しました。セキュリティ上、インストールは続行できません。サイト管理者にお問い合わせください。"
+    _pluginParseFailed:
+      title: "AiScript エラー"
+      description: "データは取得できたものの、AiScriptの解析時にエラーがあったため読み込めませんでした。プラグインの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。"
+    _pluginInstallFailed:
+      title: "プラグインのインストールに失敗しました"
+      description: "プラグインのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"
+    _themeParseFailed:
+      title: "テーマ解析エラー"
+      description: "データは取得できたものの、テーマファイルの解析時にエラーがあったため読み込めませんでした。テーマの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。"
+    _themeInstallFailed:
+      title: "テーマのインストールに失敗しました"
+      description: "テーマのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"
+
+_dataSaver:
+  _media:
+    title: "メディアの読み込み"
+    description: "画像・動画が自動で読み込まれるのを防止します。隠れている画像・動画はタップすると読み込まれます。"
+  _avatar:
+    title: "アイコン画像"
+    description: "アイコン画像のアニメーションが停止します。アニメーション画像は通常の画像よりファイルサイズが大きいことがあるので、データ通信量をさらに削減できます。"
+  _urlPreview:
+    title: "URLプレビューのサムネイル"
+    description: "URLプレビューのサムネイル画像が読み込まれなくなります。"
+  _code:
+    title: "コードハイライト"
+    description: "MFMなどでコードハイライト記法が使われている場合、タップするまで読み込まれなくなります。コードハイライトではハイライトする言語ごとにその定義ファイルを読み込む必要がありますが、それらが自動で読み込まれなくなるため、通信量の削減が見込めます。"

locales/ja-KS.yml

@@ -45,6 +45,7 @@ pin: "ピン留めしとく"
 unpin: "やっぱピン留めせん"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
+copyLinkRenote: "リノートのリンクをコピーするで？"
 delete: "ほかす"
 deleteAndEdit: "ほかして直す"
 deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのツッコミ、Renote、返信も全部消えるんやけどそれでもええん？"
@@ -194,6 +195,7 @@ perHour: "1時間ごと"
 perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送をやめる"
 blockThisInstance: "このサーバーをブロックすんで"
+silenceThisInstance: "サーバーサイレンスすんで？"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -213,6 +215,8 @@ clearCachedFiles: "キャッシュをほかす"
 clearCachedFilesConfirm: "キャッシュされとるリモートファイルをみんなほかしてええか？"
 blockedInstances: "ブロックしたサーバー"
 blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定してな。ブロックされてもうたサーバーとはもう金輪際やり取りできひんくなるで。ついでにそのサブドメインもブロックするで。"
+silencedInstances: "サーバーサイレンスされてんねん"
+silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定すんで。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなんねん。ブロックしたインスタンスには影響せーへんで。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
@@ -410,12 +414,14 @@ aboutMisskey: "Misskeyってなんや？"
 administrator: "管理者"
 token: "トークン"
 2fa: "二要素認証"
+setupOf2fa: "二要素認証のセットアップ"
 totp: "認証アプリ"
 totpDescription: "認証アプリ使うてワンタイムパスワードを入れる"
 moderator: "モデレーター"
 moderation: "モデレーション"
 moderationNote: "モデレーションノート"
 addModerationNote: "モデレーションノートを追加するで"
+moderationLogs: "モデログ"
 nUsersMentioned: "{n}人が投稿"
 securityKeyAndPasskey: "セキュリティキー・パスキー"
 securityKey: "セキュリティキー"
@@ -528,6 +534,7 @@ serverLogs: "サーバーログ"
 deleteAll: "全部ほかす"
 showFixedPostForm: "タイムラインの上の方で投稿できるようにやってくれへん？"
 showFixedPostFormInChannel: "タイムラインの上の方で投稿できるようにするわ(チャンネル)"
+withRepliesByDefaultForNewlyFollowed: "フォローする時、デフォルトで返信をタイムラインに含むようにしよか"
 newNoteRecived: "新しいノートがあるで"
 sounds: "サウンド"
 sound: "サウンド"
@@ -586,7 +593,7 @@ poll: "アンケート"
 useCw: "内容を隠す"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ツイートを展開する"
+expandTweet: "ポストを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 describeFile: "キャプションを付ける"
@@ -655,6 +662,7 @@ behavior: "動作"
 sample: "サンプル"
 abuseReports: "通報"
 reportAbuse: "通報"
+reportAbuseRenote: "リノート苦情だすで？"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "細かい通報理由を書いてなー。対象ノートがある時はそのURLも書いといてなー。"
 abuseReported: "無事内容が送信されたみたいやで。おおきに〜。"
@@ -707,6 +715,7 @@ lockedAccountInfo: "フォローを承認制にしとっても、ノートの公
 alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にするで"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にするで"
 disableShowingAnimatedImages: "アニメーション画像を再生せんとくで"
+highlightSensitiveMedia: "メディアがセンシティブなことをめっっちゃわかりやすく表紙"
 verificationEmailSent: "無事確認のメールを送れたで。メールに書いてあるリンクにアクセスして、設定を完了してなー。"
 notSet: "未設定"
 emailVerified: "メールアドレスは確認されたで"
@@ -970,6 +979,7 @@ assign: "アサイン"
 unassign: "アサインを解除"
 color: "色"
 manageCustomEmojis: "カスタム絵文字の管理"
+manageAvatarDecorations: "アバターを飾るモンの管理"
 youCannotCreateAnymore: "これ以上作れなさそうやわ"
 cannotPerformTemporary: "一時的に利用できへんで"
 cannotPerformTemporaryDescription: "操作回数が制限を超えたから一時的に利用できへんくなったで。ちょっと時間置いてからもう一回やってやー。"
@@ -1021,6 +1031,7 @@ retryAllQueuesConfirmText: "一時的にサーバー重なるかもしれへん
 enableChartsForRemoteUser: "リモートユーザーのチャートを作る"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを作る"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
+reactionsDisplaySize: "リアクションの表示のでかさ"
 noteIdOrUrl: "ノートIDかURL"
 video: "動画"
 videos: "動画"
@@ -1107,8 +1118,46 @@ replies: "返事"
 renotes: "Renote"
 loadReplies: "返信を見るで"
 loadConversation: "会話を見るで"
+pinnedList: "ピン留めしはったリスト"
+keepScreenOn: "デバイスの画面を常にオンにすんで"
 verifiedLink: "このリンク先の所有者であることが確認されたで。"
+notifyNotes: "投稿を通知"
+unnotifyNotes: "投稿の通知を解除すんで"
+authentication: "認証"
 authenticationRequiredToContinue: "続けるには認証をやってや。"
+dateAndTime: "日時"
+showRenotes: "リノートを表示"
+edited: "編集し終わってる"
+notificationRecieveConfig: "通知を受け取るかの設定"
+mutualFollow: "お互いフォローしてんで"
+fileAttachedOnly: "ファイル付きのみ"
+showRepliesToOthersInTimeline: "タイムラインに他の人への返信とかも含めんで"
+hideRepliesToOthersInTimeline: "タイムラインに他の人への返信とかは見ーへんで"
+showRepliesToOthersInTimelineAll: ""
+hideRepliesToOthersInTimelineAll: ""
+confirmShowRepliesAll: ""
+confirmHideRepliesAll: ""
+externalServices: "他のサイトのサービス"
+impressum: "運営者の情報"
+impressumUrl: "運営者の情報URL"
+impressumDescription: "ドイツなどのほんま1部の国と地域ではな、表示が義務付けられててん。(Impressum)"
+privacyPolicy: "プライバシーポリシー"
+privacyPolicyUrl: "プライバシーポリシーURL"
+tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
+avatarDecorations: "アイコンデコレーション"
+attach: ""
+detach: ""
+angle: ""
+flip: "反転"
+showAvatarDecorations: ""
+releaseToRefresh: "離してリロード"
+refreshing: "リロード中"
+pullDownToRefresh: "引っ張ってリロードするで"
+disableStreamingTimeline: "タイムラインのリアルタイム更新をやめるで"
+useGroupedNotifications: "通知をグルーピングしてだすで"
+signupPendingError: "メールアドレスの確認中に問題が起こってえらいこっちゃ。リンクの有効期限が切れてるかもやで"
+cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要やで。"
+doReaction: "ツッコミすんで"
 _announcement:
   forExistingUsers: "もうおるユーザーのみ"
   forExistingUsersDescription: "有効にすると、このお知らせ作成時点でおるユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。"
@@ -1118,6 +1167,10 @@ _announcement:
   tooManyActiveAnnouncementDescription: "アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討した方がええよ。"
   readConfirmTitle: "既読にしてええんやな?"
   readConfirmText: "「{title}」の内容を読み、既読にします。"
+  shouldNotBeUsedToPresentPermanentInfo: "新規ユーザーのUXを損ねやすいから、お知らせはストック情報やのうてフロー情報の掲示に使った方がええで。"
+  dialogAnnouncementUxWarn: "ダイアログ形式のお知らせが同時に2つ以上ある場合、UXに悪影響を及ぼす可能性が高くなるから、使用は慎重にすんのがおすすめやで。"
+  silence: "通知せんで"
+  silenceDescription: "オンにすると、このお知らせは通知されないで、既読にする必要もなくなるで。"
 _initialAccountSetting:
   accountCreated: "アカウント作り終わったで。"
   letsStartAccountSetup: "アカウントの初期設定をしよか。"
@@ -1130,9 +1183,24 @@ _initialAccountSetting:
   pushNotificationDescription: "プッシュ通知を有効にすると{name}の通知をあんたのデバイスで受け取れるで。"
   initialAccountSettingCompleted: "初期設定が終わったで。"
   haveFun: "{name}、楽しんでな～"
-  ifYouNeedLearnMore: "{name}(Misskey)の使い方とかをよー知りたいんやったら{link}をみてな。"
+  youCanContinueTutorial: "このまま{name}(Misskey)の使い方のチュートリアルに進めるけど、ここで中断してすぐに使い始めることもできるで。"
+  startTutorial: "チュートリアルを開始するで"
   skipAreYouSure: "初期設定飛ばすか？"
   laterAreYouSure: "初期設定あとでやり直すん？"
+_initialTutorial:
+  launchTutorial: "チュートリアルを見るで"
+  title: "チュートリアルやで"
+  wellDone: "やるやん"
+  skipAreYouSure: "チュートリアルをやめるか？"
+  _landing:
+    title: "チュートリアルによう来たな"
+    description: "ここでは、Misskeyの基本的な使い方や機能を確認できるで。"
+  _note:
+    title: "ノートってなんや？"
+    description: "Misskeyでの投稿は「ノート」って呼ばれてるで。ノートはタイムラインに時系列で並んでいて、リアルタイムで更新されてるで。"
+    reply: "返信することもできるで。返信に対しての返信も可能で、スレッドのように会話を続けることもできるで。"
+    renote: "そのノートを自分のタイムラインに流して共有することもできるで。テキストを追加して引用することもできるで。"
+    reaction: "ツッコミをつけることもできるで。細かいことは次のページで解説するで。"
 _serverRules:
   description: "新規登録前に見せる、サーバーの簡潔なルールを設定すんで。内容は使うための決め事の要約とすることを推奨するわ。"
 _serverSettings:
@@ -1141,7 +1209,10 @@ _serverSettings:
   appIconUsageExample: "PWAや、スマートフォンのホーム画面にブックマークとして追加された時など"
   appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるさかいに、塗り潰された余白のある背景があるものが推奨されるで。"
   appIconResolutionMustBe: "解像度は必ず{resolution}である必要があるで。"
+  manifestJsonOverride: "manifest.jsonのオーバーライド"
+  shortName: "略称"
   shortNameDescription: "サーバーの名前が長い時に、代わりに表示することのできるあだ名。"
+  fanoutTimelineDescription: ""
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
   moveFromSub: "別のアカウントへエイリアスを作る"
@@ -1396,6 +1467,9 @@ _achievements:
       title: "Brain Diver"
       description: "Brain Diverへのリンクを投稿したった"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "テスト過剰"
+      description: "通知テストをごく短時間のうちに連続して行ったねん"
 _role:
   new: "ロールの作成"
   edit: "ロールの編集"
@@ -1439,6 +1513,7 @@ _role:
     inviteLimitCycle: "招待コードの発行間隔"
     inviteExpirationTime: "招待コードの有効期限"
     canManageCustomEmojis: "カスタム絵文字の管理"
+    canManageAvatarDecorations: "アバターを飾るモンの管理"
     driveCapacity: "ドライブ容量"
     alwaysMarkNsfw: "勝手にファイルにNSFWをくっつける"
     pinMax: "ノートのピン留めの最大数"
@@ -1453,6 +1528,7 @@ _role:
     descriptionOfRateLimitFactor: "ちっちゃいほど制限が緩なって、大きいほど制限されるで。"
     canHideAds: "広告を表示させへん"
     canSearchNotes: "ノート検索を使わすかどうか"
+    canUseTranslator: "翻訳機能の利用"
   _condition:
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
@@ -1501,6 +1577,10 @@ _ad:
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げるで"
   hide: "表示せん"
   timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されるで。"
+  adsSettings: "広告配信設定"
+  notesPerOneAd: "リアタイ更新中に広告を出す間隔（ノートの個数な）"
+  setZeroToDisable: "0でリアタイ更新時の広告配信を無効にすんで"
+  adsTooClose: "広告を出す間隔がめっちゃ短いから、ユーザー体験が著しく損なわれる可能性があんで。"
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスをここに入力してや。そのアドレス宛に、パスワードリセット用のリンクが送られるから待っててな～。"
   ifNoEmail: "メールアドレスを登録してへんのやったら、管理者まで教えてな～。"
@@ -1553,6 +1633,7 @@ _aboutMisskey:
   donate: "Misskeyに寄付"
   morePatrons: "他にもぎょうさんの人からサポートしてもろてんねん。ほんまおおきに🥰"
   patrons: "支援者"
+  projectMembers: ""
 _displayOfSensitiveMedia:
   respect: "きわどいのは見とうない"
   ignore: "きわどいのも見たい"
@@ -1684,22 +1765,13 @@ _time:
   minute: "分"
   hour: "時間"
   day: "日"
-_timelineTutorial:
-  title: "Misskeyってなんや？"
-  step1_1: "これは「タイムライン」や。{name}に投稿された「ノート」が順番に表示されるで。"
-  step1_2: "タイムラインには何個か種類があってな、例えば「ホームタイムライン」だったらあんたのフォローしてる人のノート、「ローカルタイムライン」には{name}全部のノートが流れてくるで。"
-  step2_1: "試しに、何かノートを投稿してみ。画面の鉛筆マークのボタンでフォームが開くで。"
-  step2_2: "最初のノートは、自己紹介とか「{name}始めてみたんや」とかがええと思うで。"
-  step3_1: "投稿できた？"
-  step3_2: "あんたのノートがタイムラインに出てきたら成功や。"
-  step4_1: "ノートには、「ツッコミ」を付けれるで。"
-  step4_2: "ツッコむんやったら、ノートの「+」マークを押して、好きな絵文字を選ぶんやで。"
 _2fa:
   alreadyRegistered: "もう設定終わっとるわ。"
   registerTOTP: "認証アプリの設定はじめる"
   step1: "ほんなら、{a}や{b}とかの認証アプリを使っとるデバイスにインストールしてな。"
   step2: "次に、ここにあるQRコードをアプリでスキャンしてな～。"
   step2Click: "QRコードをクリックすると、今使とる端末に入っとる認証アプリとかキーリングに登録できるで。"
+  step2Uri: "デスクトップアプリを使う時は次のURIを入れるで"
   step3Title: "確認コードを入れてーや"
   step3: "アプリに表示されているトークンを入力して終わりや。"
   setupCompleted: "設定が完了したで。"
@@ -1718,6 +1790,7 @@ _2fa:
   renewTOTPOk: "もっかい設定する"
   renewTOTPCancel: "やめとく"
   checkBackupCodesBeforeCloseThisWizard: "このウィザードを閉じる前に、したのバックアップコードを確認しいや。"
+  backupCodes: "バックアップコード"
   backupCodesDescription: "認証アプリが使用できんなった場合、以下のバックアップコードを使ってアカウントにアクセスできるで。これらのコードは必ず安全な場所に置いときや。各コードは一回だけ使用できるで。"
   backupCodeUsedWarning: "バックアップコードが使用されたで。認証アプリが使えなくなってるん場合、なるべく早く認証アプリを再設定しや。"
   backupCodesExhaustedWarning: "バックアップコードが全て使用されたで。認証アプリを利用できん場合、これ以上アカウントにアクセスできなくなるで。認証アプリを再登録しや。"
@@ -1773,6 +1846,7 @@ _antennaSources:
   homeTimeline: "フォローしとるユーザーのノート"
   users: "選らんだ一人か複数のユーザーのノート"
   userList: "選んだリストのユーザーのノート"
+  userBlacklist: "選んだ１人か複数のユーザーのノート"
 _weekday:
   sunday: "日曜日"
   monday: "月曜日"
@@ -1872,6 +1946,7 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アバター画像を変更するで"
   changeBanner: "バナー画像を変更するで"
+  verifiedLinkDescription: "内容をURLに設定すると、リンク先のwebサイトに自分のプロフのリンクが含まれてる場合に所有者確認済みアイコンを表示させることができるで。"
 _exportOrImport:
   allNotes: "全てのノート"
   favoritedNotes: "お気に入りにしたノート"
@@ -1881,6 +1956,7 @@ _exportOrImport:
   userLists: "リスト"
   excludeMutingUsers: "ミュートしてるユーザーは入れんとくわ"
   excludeInactiveUsers: "使われてなさそうなアカウントは入れんとくわ"
+  withReplies: "インポートした人による返信をTLに含むようにすんで。"
 _charts:
   federation: "連合"
   apRequest: "リクエスト"
@@ -1990,14 +2066,17 @@ _notification:
   youReceivedFollowRequest: "フォロー許可してほしいみたいやな"
   yourFollowRequestAccepted: "フォローさせてもろたで"
   pollEnded: "アンケートの結果が出たみたいや"
+  newNote: "さらの投稿"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしといたで"
   achievementEarned: "実績を獲得しとるで"
+  testNotification: "通知テスト"
   checkNotificationBehavior: "通知の表示を確かめるで"
   sendTestNotification: "テスト通知を送信するで"
   notificationWillBeDisplayedLikeThis: "通知はこのように表示されるで"
   _types:
     all: "すべて"
+    note: "あんたらの新規投稿"
     follow: "フォロー"
     mention: "メンション"
     reply: "リプライ"
@@ -2032,6 +2111,7 @@ _deck:
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選んでウィジェットを追加してなー"
   useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
   usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となるで"
+  flexible: "幅を自動調整"
   _columns:
     main: "メイン"
     widgets: "ウィジェット"
@@ -2067,6 +2147,80 @@ _webhookSettings:
     reaction: "ツッコミがあるとき～！"
     mention: "メンションがあるとき～！"
 _moderationLogTypes:
+  createRole: "ロールを追加すんで"
+  deleteRole: "ロールほかす"
+  updateRole: "ロールの更新すんで"
+  assignRole: "ロールへアサイン"
+  unassignRole: "ロールのアサインほかす"
   suspend: "凍結"
+  unsuspend: "凍結解除"
+  addCustomEmoji: "自由な絵文字追加されたで"
+  updateCustomEmoji: "自由な絵文字更新されたで"
+  deleteCustomEmoji: "自由な絵文字消されたで"
+  updateServerSettings: "サーバー設定更新すんねん"
+  updateUserNote: "モデレーションノート更新"
+  deleteDriveFile: "ファイルをほかす"
+  deleteNote: "ノートを削除"
+  createGlobalAnnouncement: "みんなへの通告を作成したで"
+  createUserAnnouncement: "あんたらへの通告を作成したで"
+  updateGlobalAnnouncement: "みんなへの通告更新したったで"
+  updateUserAnnouncement: "あんたらへの通告更新したったで"
+  deleteGlobalAnnouncement: "みんなへの通告消したったで"
+  deleteUserAnnouncement: "あんたらへのお知らせを削除"
   resetPassword: "パスワードをリセット"
+  suspendRemoteInstance: "リモートサーバーを止めんで"
+  unsuspendRemoteInstance: "リモートサーバーを再開すんで"
+  markSensitiveDriveFile: "ファイルをセンシティブ付与"
+  unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
+  resolveAbuseReport: "苦情を解決"
   createInvitation: "招待コードを作成"
+  createAd: "広告を作んで"
+  deleteAd: "広告ほかす"
+  updateAd: "広告を更新"
+  createAvatarDecoration: "アイコンデコレーションを作成"
+  updateAvatarDecoration: "アイコンデコレーションを更新"
+  deleteAvatarDecoration: "アイコンデコレーションを削除"
+_fileViewer:
+  title: "ファイルの詳しい情報"
+  type: "ファイルの種類"
+  size: "ファイルのでかさ"
+  url: "URL"
+  uploadedAt: "追加した日"
+  attachedNotes: "ファイルがついてきてるノート"
+  thisPageCanBeSeenFromTheAuthor: "このページはこのファイルをアップした人しか見れへんねん。"
+_externalResourceInstaller:
+  title: "ほかのサイトからインストール"
+  checkVendorBeforeInstall: "配ってるとこが信頼できるか確認した上でインストールしてな。"
+  _plugin:
+    title: "このプラグイン、インストールする？"
+    metaTitle: "プラグイン情報"
+  _theme:
+    title: "このテーマインストールする？"
+    metaTitle: "テーマ情報"
+  _meta:
+    base: ""
+  _vendorInfo:
+    title: ""
+    endpoint: ""
+    hashVerify: ""
+  _errors:
+    _invalidParams:
+      title: ""
+      description: ""
+    _resourceTypeNotSupported:
+      title: ""
+      description: ""
+    _failedToFetch:
+      title: ""
+    _pluginParseFailed:
+      title: "AiScriptエラー起こしてもうたねん"
+      description: "データは取得できたものの、AiScript解析時にエラーがあったから読み込めへんかってん。すまんが、プラグインを作った人に問い合わせてくれへん？ごめんな。エラーの詳細はJavaScriptコンソール読んでな。"
+    _pluginInstallFailed:
+      title: "プラグインのインストール失敗してもた"
+      description: "プラグインのインストール中に問題発生してもた、もう1度試してな。エラーの詳細はJavaScriptのコンソール見てや。"
+    _themeParseFailed:
+      title: "テーマ解析エラー"
+      description: "データは取得できたものの、テーマファイル解析時にエラーがあったから読み込めへんかってん。すまんが、テーマ作った人に問い合わせてくれへん？ごめんな。エラーの詳細はJavaScriptコンソール読んでな。"
+    _themeInstallFailed:
+      title: "テーマインストールに失敗してもた"
+      description: "テーマのインストール中に問題発生してもた、もう1度試してな。エラーの詳細はJavaScriptのコンソール見てや。"

locales/ko-KR.yml

@@ -113,7 +113,7 @@ cantReRenote: "리노트를 리노트할 수 없습니다."
 quote: "인용"
 inChannelRenote: "채널 내 리노트"
 inChannelQuote: "채널 내 인용"
-pinnedNote: "고정해놓은 노트"
+pinnedNote: "고정된 노트"
 pinned: "프로필에 고정"
 you: "당신"
 clickToShow: "클릭하여 보기"
@@ -162,8 +162,8 @@ cacheRemoteSensitiveFiles: "리모트의 민감한 파일을 캐시"
 cacheRemoteSensitiveFilesDescription: "이 설정을 비활성화하면 리모트의 민감한 파일은 캐시하지 않고 리모트에서 직접 가져오도록 합니다."
 flagAsBot: "나는 봇입니다"
 flagAsBotDescription: "이 계정을 자동화된 수단으로 운용할 경우에 활성화해 주세요. 이 플래그를 활성화하면, 다른 봇이 이를 참고하여 봇 끼리의 무한 연쇄 반응을 회피하거나, 이 계정의 시스템 상에서의 취급이 Bot 운영에 최적화되는 등의 변화가 생깁니다."
-flagAsCat: "나는 고양이다냥"
-flagAsCatDescription: "이 계정이 고양이라면 활성화해 주세요."
+flagAsCat: "미야아아아오오오오오오오오오옹!!!!!!!"
+flagAsCatDescription: "야옹?"
 flagShowTimelineReplies: "타임라인에 노트의 답글을 표시하기"
 flagShowTimelineRepliesDescription: "이 설정을 활성화하면 타임라인에 다른 유저 간의 답글을 표시합니다."
 autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
@@ -195,6 +195,7 @@ perHour: "1시간마다"
 perDay: "1일마다"
 stopActivityDelivery: "액티비티 보내지 않기"
 blockThisInstance: "이 서버를 차단"
+silenceThisInstance: "서버를 사일런스"
 operations: "작업"
 software: "소프트웨어"
 version: "버전"
@@ -214,6 +215,8 @@ clearCachedFiles: "캐시 비우기"
 clearCachedFilesConfirm: "캐시된 리모트 파일을 모두 삭제하시겠습니까?"
 blockedInstances: "차단된 서버"
 blockedInstancesDescription: "차단하려는 서버의 호스트 이름을 줄바꿈으로 구분하여 설정합니다. 차단된 인스턴스는 이 인스턴스와 통신할 수 없게 됩니다."
+silencedInstances: "사일런스한 서버"
+silencedInstancesDescription: "사일런스하려는 서버의 호스트명을 한 줄에 하나씩 입력합니다. 사일런스된 서버에 소속된 유저는 모두 '사일런스'된 상태로 취급되며, 이 서버로부터의 팔로우가 프로필 설정과 무관하게 승인제로 변경되고, 팔로워가 아닌 로컬 유저에게는 멘션할 수 없게 됩니다. 정지된 서버에는 적용되지 않습니다."
 muteAndBlock: "뮤트 및 차단"
 mutedUsers: "뮤트한 유저"
 blockedUsers: "차단한 유저"
@@ -364,7 +367,7 @@ pinnedUsersDescription: "\"발견하기\" 페이지 등에 고정하고 싶은
 pinnedPages: "고정한 페이지"
 pinnedPagesDescription: "서버의 대문에 고정하고 싶은 페이지의 경로를 한 줄에 하나씩 적습니다."
 pinnedClipId: "고정할 클립의 ID"
-pinnedNotes: "고정해놓은 노트"
+pinnedNotes: "고정된 노트"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha 활성화"
 hcaptchaSiteKey: "사이트 키"
@@ -531,6 +534,7 @@ serverLogs: "서버 로그"
 deleteAll: "모두 삭제"
 showFixedPostForm: "타임라인 상단에 글 작성란을 표시"
 showFixedPostFormInChannel: "채널 타임라인 상단에 글 작성란을 표시"
+withRepliesByDefaultForNewlyFollowed: "팔로우 할 때 기본적으로 답글을 타임라인에 나오게 하기"
 newNoteRecived: "새 노트가 있습니다"
 sounds: "소리"
 sound: "소리"
@@ -589,7 +593,7 @@ poll: "투표"
 useCw: "내용 숨기기"
 enablePlayer: "플레이어 열기"
 disablePlayer: "플레이어 닫기"
-expandTweet: "트윗 확장하기"
+expandTweet: "게시물 확장하기"
 themeEditor: "테마 에디터"
 description: "설명"
 describeFile: "캡션 추가"
@@ -711,6 +715,7 @@ lockedAccountInfo: "팔로우를 승인으로 승인받더라도 노트의 공
 alwaysMarkSensitive: "미디어를 항상 열람 주의로 설정"
 loadRawImages: "첨부한 이미지의 썸네일을 원본화질로 표시"
 disableShowingAnimatedImages: "움직이는 이미지를 자동으로 재생하지 않음"
+highlightSensitiveMedia: "미디어가 민감한 내용이라는 것을 알기 쉽게 표시"
 verificationEmailSent: "확인 메일을 발송하였습니다. 설정을 완료하려면 메일에 첨부된 링크를 확인해 주세요."
 notSet: "설정되지 않음"
 emailVerified: "메일 주소가 확인되었습니다."
@@ -974,6 +979,7 @@ assign: "할당"
 unassign: "할당 취소"
 color: "색"
 manageCustomEmojis: "커스텀 이모지 관리"
+manageAvatarDecorations: "아바타 꾸미기 관리"
 youCannotCreateAnymore: "더 이상 생성할 수 없습니다."
 cannotPerformTemporary: "일시적으로 사용할 수 없음"
 cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요."
@@ -1112,16 +1118,46 @@ replies: "답글"
 renotes: "리노트"
 loadReplies: "답글 보기"
 loadConversation: "대화 보기"
-pinnedList: "고정해놓은 리스트"
+pinnedList: "고정된 리스트"
 keepScreenOn: "기기 화면을 항상 켜기"
 verifiedLink: "이 링크의 소유자임이 확인되었습니다."
 notifyNotes: "새 노트 알림 켜기"
 unnotifyNotes: "새 노트 알림 끄기"
 authentication: "인증"
+authenticationRequiredToContinue: "계속하려면 인증하십시오"
+dateAndTime: "일시"
 showRenotes: "리노트 표시"
 edited: "수정됨"
 notificationRecieveConfig: "알림 설정"
 mutualFollow: "맞팔로우"
+fileAttachedOnly: "미디어를 포함한 노트만"
+showRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함"
+hideRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함하지 않음"
+showRepliesToOthersInTimelineAll: "타임라인에 현재 팔로우 중인 사람 전원의 답글을 포함하게 하기"
+hideRepliesToOthersInTimelineAll: "타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하기"
+confirmShowRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하시겠습니까?"
+confirmHideRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하시겠습니까?"
+externalServices: "외부 서비스"
+impressum: "운영자 정보"
+impressumUrl: "운영자 정보 URL"
+impressumDescription: "독일 등의 일부 나라와 지역에서는 꼭 표시해야 합니다(Impressum)."
+privacyPolicy: "개인정보 보호 정책"
+privacyPolicyUrl: "개인정보 보호 정책 URL"
+tosAndPrivacyPolicy: "약관 및 개인정보 보호 정책"
+avatarDecorations: "아이콘 장식"
+attach: "붙이기"
+detach: "떼기"
+angle: "각도"
+flip: "플립"
+showAvatarDecorations: "아이콘 장식을 표시"
+releaseToRefresh: "놓아서 새로고침"
+refreshing: "새로고침 중"
+pullDownToRefresh: "아래로 내려서 새로고침"
+disableStreamingTimeline: "타임라인의 실시간 갱신을 무효화하기"
+useGroupedNotifications: "알림을 그룹화하고 표시"
+signupPendingError: "메일 주소 확인중에 문제가 발생했습니다. 링크의 유효기간이 지났을 가능성이 있습니다."
+cwNotationRequired: "'내용을 숨기기'를 체크한 경우 주석을 써야 합니다."
+doReaction: "리액션 추가"
 _announcement:
   forExistingUsers: "기존 유저에게만 알림"
   forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다."
@@ -1131,6 +1167,10 @@ _announcement:
   tooManyActiveAnnouncementDescription: "공지사항이 너무 많을 경우, 사용자 경험에 영향을 끼칠 가능성이 있습니다. 오래된 공지사항은 아카이브하시는 것을 권장드립니다."
   readConfirmTitle: "읽음으로 표시합니까?"
   readConfirmText: "\"{title}\"을(를) 읽음으로 표시합니다."
+  shouldNotBeUsedToPresentPermanentInfo: "신규 유저의 이용 경험에 악영향을 끼칠 수 있으므로, 일시적인 알림 수단으로만 사용하고 고정된 정보에는 사용을 지양하는 것을 추천합니다."
+  dialogAnnouncementUxWarn: "다이얼로그 형태의 알림이 동시에 2개 이상 존재하는 경우, 사용자 경험에 악영향을 끼칠 수 있으므로 신중히 결정하십시오."
+  silence: "조용히 알림"
+  silenceDescription: "활성화하면 공지사항에 대한 알림이 가지 않게 되며, 확인 버튼을 누를 필요가 없게 됩니다."
 _initialAccountSetting:
   accountCreated: "계정 생성이 완료되었습니다!"
   letsStartAccountSetup: "계정의 초기 설정을 진행합니다."
@@ -1143,19 +1183,89 @@ _initialAccountSetting:
   pushNotificationDescription: "푸시 알림을 활성화하면 {name}의 알림을 나의 기기에서 받아볼 수 있게 됩니다."
   initialAccountSettingCompleted: "초기 설정을 모두 마쳤습니다!"
   haveFun: "{name}와 함께 즐거운 시간 보내세요!"
-  ifYouNeedLearnMore: "{name}(Misskey)의 사용 방법에 대해 자세히 알아보려면 {link}를 참고해 주세요."
+  youCanContinueTutorial: "이대로 {name}(Misskey)의 사용법에 대해 튜토리얼을 진행할 수도 있지만, 여기서 중단하고 바로 시작할 수도 있습니다."
+  startTutorial: "튜토리얼 시작"
   skipAreYouSure: "초기 설정을 중단하시겠습니까?"
   laterAreYouSure: "초기 설정을 나중에 진행하시겠습니까?"
+_initialTutorial:
+  launchTutorial: "튜토리얼 보기"
+  title: "튜토리얼"
+  wellDone: "잘 하셨습니다"
+  skipAreYouSure: "튜토리얼을 종료하시겠습니까?"
+  _landing:
+    title: "튜토리얼에 오신 걸 환영합니다"
+    description: "여기서는 미스키의 기본적인 사용법이나 기능을 확인할 수 있습니다."
+  _note:
+    title: "'노트'가 무엇인가요?"
+    description: "미스키에서는 게시물을 '노트'라고 합니다. 노트는 타임라인에 시간순으로 정렬되어 있고, 실시간으로 갱신됩니다."
+    reply: "답글을 다는 것이 가능합니다. 답글에 답글을 다는 것도 가능하며 스레드처럼 대화를 계속하는 것도 가능합니다."
+    renote: "그 노트를 자기 타임라인에 가져와서 공유하는 것이 가능합니다. 글을 추가해서 인용하는 것도 가능합니다."
+    reaction: "리액션을 다는 것이 가능합니다. 다음 페이지에서 자세한 설명을 볼 수 있습니다."
+    menu: "노트의 상세 정보를 표시하거나, 링크를 복사하는 등의 다양한 조작을 할 수 있습니다."
+  _reaction:
+    title: "'리액션'이 무엇인가요?"
+    description: "노트에 '리액션'을 보낼 수 있습니다. '좋아요'만으로는 충분히 전해지지 않는 감정을, 이모지에 실어서 가볍게 보낼 수 있습니다."
+    letsTryReacting: "리액션은 노트의 '+' 버튼을 클릭하여 붙일 수 있습니다. 지금 표시되는 샘플 노트에 리액션을 달아 보세요!"
+    reactToContinue: "다음으로 진행하려면 리액션을 보내세요."
+    reactNotification: "누군가가 나의 노트에 리액션을 보내면 실시간으로 알림을 받게 됩니다."
+    reactDone: "'-' 버튼을 눌러서 리액션을 취소할 수 있습니다."
+  _timeline:
+    title: "타임라인에 대하여"
+    description1: "Misskey에는 종류에 따라 여러 가지의 타임라인으로 구성되어 있습니다. (서버에 따라서는 일부 타임라인을 사용할 수 없는 경우가 있습니다)"
+    home: "내가 팔로우 중인 계정의 노트를 볼 수 있습니다."
+    local: "이 서버에 있는 모든 유저의 게시물을 볼 수 있습니다."
+    social: "홈 타임라인과 로컬 타임라인의 게시물을 모두 볼 수 있습니다."
+    global: "연결되어 있는 모든 서버의 게시물을 볼 수 있습니다."
+    description2: "각각의 타임라인은 화면 상단에서 언제든지 변경할 수 있습니다."
+    description3: "이 외에도, '리스트 타임라인'이나 '채널 타임라인' 등이 있습니다. 자세한 사항은 {link}에서 확인하실 수 있습니다."
+  _postNote:
+    title: "노트 게시 설정"
+    description1: "Misskey에 노트를 쓸 때에는 다양한 옵션을 설정할 수 있습니다. 노트를 작성하는 화면은 이렇게 생겼습니다."
+    _visibility:
+      description: "노트를 볼 수 있는 사람을 제한할 수 있습니다."
+      public: "모든 유저에게 공개합니다."
+      home: "홈 타임라인에만 공개합니다. 팔로워, 프로필 화면, 리노트를 통해서 다른 유저가 볼 수 있습니다."
+      followers: "팔로워에게만 공개. 자기 자신을 제외하고는 리노트가 불가능하며, 팔로워 외에는 열람할 수 없습니다."
+      direct: "지정한 유저에게만 공개되며, 상대방에게 알림이 갑니다. 다이렉트 메시지(DM) 대용으로써 사용하실 수 있습니다."
+      doNotSendConfidencialOnDirect1: "민감한 정보를 보낼 때에는 주의하십시오."
+      doNotSendConfidencialOnDirect2: "서버 관리자는 기술적으로 게시물 내용을 열람할 수 있습니다. 신뢰할 수 없는 서버의 유저에게 다이렉트 메시지를 보내는 경우, 민감한 정보가 포함되어 있는 지 확인하십시오."
+      localOnly: "다른 서버에 게시물을 보내지 않습니다. 앞서 설정한 공개 범위와 상관 없이, 다른 서버의 유저는 이 게시물을 직접 열람할 수 없게 됩니다."
+    _cw:
+      title: "내용 가리기 (CW)"
+      description: "본문 대신에 '내용에 대한 주석'에 입력한 텍스트가 먼저 표시됩니다. '더 보기' 버튼을 누르면 본문이 표시됩니다."
+      _exampleNote:
+        cw: "배고픈 사람 주의"
+        note: "방금 초코도넛을 먹었어요 🍩😋"
+      useCases: "서버의 가이드라인에 따라 특정 주제를 다룰 때에 사용하거나, 스포일러 및 민감한 화제를 다룰 때에 자율적으로 사용하기도 합니다."
+  _howToMakeAttachmentsSensitive:
+    title: "첨부 파일을 열람주의로 설정하려면?"
+    description: "서버의 가이드라인에 따라 필요한 이미지, 또는 그대로 노출되기에 부적절한 미디어는 '열람 주의'를 설정해 주세요."
+    tryThisFile: "이 작성 창에 첨부된 이미지를 열람 주의로 설정해 보세요!"
+    _exampleNote:
+      note: "낫또 뚜껑 뜯다가 실수했다…"
+    method: "첨부 파일을 열람 주의로 설정하려면, 해당 파일을 클릭하여 메뉴를 열고, '열람주의로 설정'을 클릭합니다."
+    sensitiveSucceeded: "파일을 첨부할 때에는 서버의 가이드라인에 따라 적절히 열람주의를 설정해 주시기 바랍니다."
+    doItToContinue: "이미지를 열람 주의로 설정하면 다음으로 넘어갈 수 있게 됩니다."
+  _done:
+    title: "튜토리얼이 끝났습니다! 🎉"
+    description: "여기에서 소개한 기능은 극히 일부에 지나지 않습니다. Misskey의 사용 방법을 더 자세히 알아보려면 {link}를 확인해 주세요!"
+_timelineDescription:
+  home: "홈 타임라인에서는, 내가 팔로우한 계정의 게시물을 볼 수 있습니다."
+  local: "로컬 타임라인에서는, 이 서버의 모든 유저의 게시물을 볼 수 있습니다."
+  social: "소셜 타임라인에서는, 홈 타임라인과 로컬 타임라인의 게시물을 모두 볼 수 있습니다."
+  global: "글로벌 타임라인에서는, 여기와 연결된 다른 모든 서버의 게시물을 볼 수 있습니다."
 _serverRules:
   description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다."
 _serverSettings:
   iconUrl: "아이콘 URL"
+  appIconDescription: "{host}이 앱으로 표시될 때의 아이콘을 지정합니다."
   appIconUsageExample: "예를 들어, PWA나 스마트폰 홈 화면에 북마크로 추가되었을 때 등"
   appIconStyleRecommendation: "아이콘이 원형 또는 둥근 사각형으로 잘리는 경우가 있으므로, 가장자리 여백이 충분한 사진을 사용하는 것을 추천합니다."
   appIconResolutionMustBe: "해상도는 반드시 {resolution} 이어야 합니다."
   manifestJsonOverride: "manifest.json 오버라이드"
   shortName: "약칭"
   shortNameDescription: "서버의 정식 명칭이 긴 경우에, 대신에 표시할 수 있는 약칭이나 통칭."
+  fanoutTimelineDescription: "활성화하면 각종 타임라인을 가져올 때의 성능을 대폭 향상하며, 데이터베이스의 부하를 줄일 수 있습니다. 단, Redis의 메모리 사용량이 증가합니다. 서버의 메모리 용량이 작거나, 서비스가 불안정해지는 경우 비활성화할 수 있습니다."
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1410,6 +1520,12 @@ _achievements:
       title: "Brain Diver"
       description: "Brain Diver로의 링크를 첨부했습니다"
       flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "테스트 과잉"
+      description: "매우 짧은 시간 안에 알림 테스트를 여러 번 수행했습니다"
+    _tutorialCompleted:
+      title: "Misskey 입문자 과정 수료증"
+      description: "튜토리얼을 완료했습니다"
 _role:
   new: "새 역할 생성"
   edit: "역할 수정"
@@ -1453,6 +1569,7 @@ _role:
     inviteLimitCycle: "초대 발급 간격"
     inviteExpirationTime: "초대 만료 기간"
     canManageCustomEmojis: "커스텀 이모지 관리"
+    canManageAvatarDecorations: "아바타 꾸미기 관리"
     driveCapacity: "드라이브 용량"
     alwaysMarkNsfw: "파일을 항상 NSFW로 지정"
     pinMax: "고정할 수 있는 노트 수"
@@ -1467,6 +1584,7 @@ _role:
     descriptionOfRateLimitFactor: "작을수록 제한이 완화되고, 클수록 제한이 강화됩니다."
     canHideAds: "광고 숨기기"
     canSearchNotes: "노트 검색 이용 가능 여부"
+    canUseTranslator: "번역 기능의 사용"
   _condition:
     isLocal: "로컬 사용자"
     isRemote: "리모트 사용자"
@@ -1515,6 +1633,10 @@ _ad:
   reduceFrequencyOfThisAd: "이 광고의 표시 빈도 낮추기"
   hide: "보이지 않음"
   timezoneinfo: "요일은 서버의 표준 시간대에 따라 결정됩니다."
+  adsSettings: "광고 표시 설정"
+  notesPerOneAd: "실시간으로 갱신되는 타임라인에서 광고를 노출시키는 간격 (노트 당)"
+  setZeroToDisable: "0으로 지정하면 실시간 타임라인에서의 광고를 비활성화합니다"
+  adsTooClose: "광고의 표시 간격이 매우 작아, 사용자 경험에 부정적인 영향을 미칠 수 있습니다."
 _forgotPassword:
   enterEmail: "여기에 계정에 등록한 메일 주소를 입력해 주세요. 입력한 메일 주소로 비밀번호 재설정 링크를 발송합니다."
   ifNoEmail: "메일 주소를 등록하지 않은 경우, 관리자에 문의해 주십시오."
@@ -1567,6 +1689,7 @@ _aboutMisskey:
   donate: "Misskey에 기부하기"
   morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰"
   patrons: "후원자"
+  projectMembers: "프로젝트 구성원"
 _displayOfSensitiveMedia:
   respect: "민감한 콘텐츠로 표시된 미디어 숨기기"
   ignore: "민감한 콘텐츠로 표시된 미디어 보이기"
@@ -1591,6 +1714,7 @@ _channel:
   notesCount: "{n}노트"
   nameAndDescription: "이름과 설명"
   nameOnly: "이름만"
+  allowRenoteToExternal: "채널 외부로의 리노트와 인용 리노트를 허가"
 _menuDisplay:
   sideFull: "가로"
   sideIcon: "가로(아이콘)"
@@ -1698,16 +1822,6 @@ _time:
   minute: "분"
   hour: "시간"
   day: "일"
-_timelineTutorial:
-  title: "Misskey의 사용 방법"
-  step1_1: "이것은 '타임라인'입니다. {name}에 게시된 '노트'가 시간 순서대로 표시됩니다."
-  step1_2: "타임라인은 몇 가지 종류로 나뉩니다. 그 중에 '홈 타임라인'은 내가 팔로우한 사람의 노트가 표시되며, '로컬 타임라인'에는 {name} 의 모든 노트가 표시됩니다."
-  step2_1: "그럼 시험삼아 노트를 작성해 봅시다. 화면에 있는 연필 버튼을 눌러 보세요."
-  step2_2: "첫 노트이니까 자기소개, 혹은 가볍게 \"안녕 {name}\"라고 올려 보는 건 어떨까요?"
-  step3_1: "노트 작성을 끝내셨나요?"
-  step3_2: "당신의 노트가 타임라인에 표시되어 있다면 성공입니다."
-  step4_1: "노트에는 '리액션'을 붙일 수 있습니다."
-  step4_2: "리액션을 붙이려면, 노트의 \"+\" 버튼을 클릭하고 원하는 이모지를 선택합니다."
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
   registerTOTP: "인증 앱 설정 시작"
@@ -1787,8 +1901,9 @@ _auth:
 _antennaSources:
   all: "모든 노트"
   homeTimeline: "팔로우중인 유저의 노트"
-  users: "지정한 한 명 혹은 여러 명의 유저의 노트"
+  users: "지정한 유저의 노트"
   userList: "지정한 리스트에 속한 유저의 노트"
+  userBlacklist: "지정한 유저를 제외한 모든 노트"
 _weekday:
   sunday: "일요일"
   monday: "월요일"
@@ -1888,6 +2003,7 @@ _profile:
   metadataContent: "내용"
   changeAvatar: "아바타 이미지 변경"
   changeBanner: "배너 이미지 변경"
+  verifiedLinkDescription: "내용에 자신의 프로필로 향하는 링크가 포함된 페이지의 URL을 삽입하면 소유자 인증 마크가 표시됩니다."
 _exportOrImport:
   allNotes: "모든 노트"
   favoritedNotes: "즐겨찾기한 노트"
@@ -1897,6 +2013,7 @@ _exportOrImport:
   userLists: "리스트"
   excludeMutingUsers: "뮤트한 유저 제외하기"
   excludeInactiveUsers: "휴면 중인 계정 제외하기"
+  withReplies: "가져오기한 유저에 의한 답글을 타임라인에 포함"
 _charts:
   federation: "연합"
   apRequest: "요청"
@@ -1970,7 +2087,7 @@ _pages:
   url: "페이지 URL"
   summary: "페이지 요약"
   alignCenter: "가운데 정렬"
-  hideTitleWhenPinned: "프로필에 고정해놓은 경우 타이틀을 표시하지 않음"
+  hideTitleWhenPinned: "프로필에 고정한 경우 타이틀을 표시하지 않음"
   font: "폰트"
   fontSerif: "명조체"
   fontSansSerif: "고딕체"
@@ -2006,6 +2123,7 @@ _notification:
   youReceivedFollowRequest: "새로운 팔로우 요청이 있습니다"
   yourFollowRequestAccepted: "팔로우 요청이 수락되었습니다"
   pollEnded: "투표 결과가 발표되었습니다"
+  newNote: "새 게시물"
   unreadAntennaNote: "안테나 {name}"
   emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
   achievementEarned: "도전 과제를 달성했습니다"
@@ -2013,8 +2131,12 @@ _notification:
   checkNotificationBehavior: "알림 표시를 체크하기"
   sendTestNotification: "테스트 알림 보내기"
   notificationWillBeDisplayedLikeThis: "알림이 이렇게 표시됩니다"
+  reactedBySomeUsers: "{n}명이 반응했습니다"
+  renotedBySomeUsers: "{n}명이 리노트했습니다"
+  followedBySomeUsers: "{n}명에게 팔로우됨"
   _types:
     all: "전부"
+    note: "유저의 새 게시물"
     follow: "팔로잉"
     mention: "멘션"
     reply: "답글"
@@ -2085,6 +2207,85 @@ _webhookSettings:
     reaction: "누군가 내 노트에 리액션했을 때"
     mention: "누군가 나를 멘션했을 때"
 _moderationLogTypes:
+  createRole: "역할 생성"
+  deleteRole: "역할 삭제"
+  updateRole: "역할 수정"
+  assignRole: "역할 할당"
+  unassignRole: "역할 해제"
   suspend: "정지"
+  unsuspend: "정지 해제"
+  addCustomEmoji: "커스텀 이모지 추가"
+  updateCustomEmoji: "커스텀 이모지 수정"
+  deleteCustomEmoji: "커스텀 이모지 삭제"
+  updateServerSettings: "서버 설정 갱신"
+  updateUserNote: "모더레이션 노트 갱신"
+  deleteDriveFile: "파일 삭제"
+  deleteNote: "노트 삭제"
+  createGlobalAnnouncement: "전역 공지사항 생성"
+  createUserAnnouncement: "유저 공지사항 생성"
+  updateGlobalAnnouncement: "전역 공지사항 수정"
+  updateUserAnnouncement: "유저 공지사항 수정"
+  deleteGlobalAnnouncement: "전역 공지사항 삭제"
+  deleteUserAnnouncement: "유저 공지사항 삭제"
   resetPassword: "비밀번호 재설정"
+  suspendRemoteInstance: "리모트 서버를 정지"
+  unsuspendRemoteInstance: "리모트 서버의 정지를 해제"
+  markSensitiveDriveFile: "파일에 열람주의를 설정"
+  unmarkSensitiveDriveFile: "파일에 열람주의를 해제"
+  resolveAbuseReport: "신고 해결"
   createInvitation: "초대 코드 생성"
+  createAd: "광고 생성"
+  deleteAd: "광고 삭제"
+  updateAd: "광고 수정"
+  createAvatarDecoration: "아이콘 장식 추가"
+  updateAvatarDecoration: "아이콘 장식 수정"
+  deleteAvatarDecoration: "아이콘 장식 삭제"
+_fileViewer:
+  title: "파일 상세"
+  type: "파일 유형"
+  size: "파일 크기"
+  url: "URL"
+  uploadedAt: "업로드 날짜"
+  attachedNotes: "첨부된 노트"
+  thisPageCanBeSeenFromTheAuthor: "이 페이지는 파일 소유자만 열람할 수 있습니다"
+_externalResourceInstaller:
+  title: "외부 사이트로부터 설치"
+  checkVendorBeforeInstall: "제공자를 신뢰할 수 있는 경우에만 설치하십시오."
+  _plugin:
+    title: "이 플러그인을 설치하시겠습니까?"
+    metaTitle: "플러그인 정보"
+  _theme:
+    title: "이 테마를 설치하시겠습니까?"
+    metaTitle: "테마 정보"
+  _meta:
+    base: "기본 컬러 스키마"
+  _vendorInfo:
+    title: "제공자 정보"
+    endpoint: "참조한 엔드포인트"
+    hashVerify: "파일 무결성 확인"
+  _errors:
+    _invalidParams:
+      title: "파라미터가 부족합니다"
+      description: "외부 사이트로부터 데이터를 불러오기 위해 필요한 정보가 부족합니다. URL을 다시 한 번 확인하십시오."
+    _resourceTypeNotSupported:
+      title: "해당하는 외부 리소스는 지원되지 않습니다."
+      description: "외부 사이트의 해당 리소스는 지원되지 않습니다. 사이트 관리자에게 문의하십시오."
+    _failedToFetch:
+      title: "데이터를 불러올 수 없습니다"
+      fetchErrorDescription: "외부 사이트와의 통신에 실패하였습니다. 여러 번 시도해도 동일한 오류가 표시되는 경우 사이트 관리자에게 문의하십시오."
+      parseErrorDescription: "외부 사이트에서 불러온 데이터를 읽어들일 수 없습니다. 사이트 관리자에게 문의하십시오."
+    _hashUnmatched:
+      title: "데이터가 올바르지 않습니다."
+      description: "데이터의 무결성 확인에 실패하여, 보안을 위해 설치가 중단되었습니다. 사이트 관리자에게 문의하십시오."
+    _pluginParseFailed:
+      title: "AiScript 오류"
+      description: "데이터를 성공적으로 불러왔으나, AiScript 분석 과정에서 오류가 발생하여 읽어들일 수 없습니다. 플러그인 작성자에게 문의하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+    _pluginInstallFailed:
+      title: "플러그인 설치에 실패했습니다"
+      description: "플러그인을 설치하는 도중 문제가 발생하였습니다. 다시 한 번 시도하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+    _themeParseFailed:
+      title: "테마 코드 분석 오류"
+      description: "데이터를 성공적으로 불러왔으나, 테마 코드 분석 과정에서 오류가 발생하여 읽어들일 수 없습니다. 테마 작성자에게 문의하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+    _themeInstallFailed:
+      title: "테마를 설치하지 못했습니다"
+      description: "테마를 설치하는 도중 문제가 발생하였습니다. 다시 한 번 시도하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."

locales/nl-NL.yml

@@ -45,6 +45,7 @@ pin: "Vastmaken aan profielpagina"
 unpin: "Losmaken van profielpagina"
 copyContent: "Kopiëren inhoud"
 copyLink: "Kopiëren link"
+copyLinkRenote: ""
 delete: "Verwijderen"
 deleteAndEdit: "Verwijderen en bewerken"
 deleteAndEditConfirm: "Weet je zeker dat je deze notitie wilt verwijderen en dan bewerken? Je verliest alle reacties, herdelingen en antwoorden erop."

locales/no-NO.yml

@@ -601,9 +601,6 @@ _time:
   minute: "Minutter"
   hour: "Timer"
   day: "Dager"
-_timelineTutorial:
-  title: "Hvordan bruke Misskey"
-  step2_2: "Hva med å skrive en selvpresentasjon, eller bare \"Hei {name}!\" hvis du ikke har lyst?"
 _2fa:
   renewTOTPCancel: "Avbryt"
 _weekday:

locales/pl-PL.yml

@@ -873,6 +873,7 @@ youFollowing: "Śledzeni"
 icon: "Awatar"
 replies: "Odpowiedz"
 renotes: "Udostępnij"
+flip: "Odwróć"
 _role:
   priority: "Priorytet"
   _priority:

locales/pt-PT.yml

@@ -1011,6 +1011,7 @@ icon: "Avatar"
 replies: "Responder"
 renotes: "Repostar"
 keepScreenOn: "Manter a tela do dispositivo sempre ligada"
+flip: "Inversão"
 _initialAccountSetting:
   followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo."
 _serverSettings:
@@ -1322,8 +1323,6 @@ _sfx:
   notification: "Notificações"
 _ago:
   invalid: "Não há nada aqui"
-_timelineTutorial:
-  step1_2: "Existem vários tipos de linhas do tempo, por exemplo, na 'Linha do Tempo Principal', você verá as notas das pessoas que está seguindo, e na 'Linha do Tempo Local', verá todas as notas de {name}."
 _2fa:
   securityKeyInfo: "Além da autenticação por impressão digital ou PIN, você também pode configurar a autenticação por chaves de segurança de hardware compatível com FIDO2 para proteger ainda mais a sua conta."
   removeKeyConfirm: "Deseja excluir {name}?"

locales/ru-RU.yml

@@ -59,7 +59,7 @@ copyFileId: "Скопировать ID файла"
 copyFolderId: "Скопировать ID папки"
 copyProfileUrl: "Скопировать URL профиля "
 searchUser: "Поиск людей"
-reply: "Ответить"
+reply: "Ответ"
 loadMore: "Показать еще"
 showMore: "Показать еще"
 showLess: "Закрыть"
@@ -409,6 +409,7 @@ aboutMisskey: "О Misskey"
 administrator: "Администратор"
 token: "Токен"
 2fa: "2-х факторная аутентификация"
+setupOf2fa: "Настроить двухфакторную аутентификацию"
 totp: "Приложение-аутентификатор"
 totpDescription: "Описание приложения-аутентификатора"
 moderator: "Модератор"
@@ -652,6 +653,7 @@ behavior: "Поведение"
 sample: "Пример"
 abuseReports: "Жалобы"
 reportAbuse: "Жалоба"
+reportAbuseRenote: "Пожаловаться на репост"
 reportAbuseOf: "Пожаловаться на пользователя {name}"
 fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь о конкретной заметке, будьте добры приложить ссылку на неё."
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
@@ -1060,13 +1062,16 @@ goToMisskey: "К Misskey"
 additionalEmojiDictionary: "Дополнительные словари эмодзи"
 installed: "Установлено"
 branding: "Бренд"
+enableIdenticonGeneration: "Включить генерацию иконки пользователя"
+turnOffToImprovePerformance: "Отключение этого параметра может повысить производительность."
 expirationDate: "Дата истечения"
 unused: "Неиспользуемый"
 expired: "Срок действия приглашения истёк"
 doYouAgree: "Согласны?"
 icon: "Аватар"
-replies: "Ответить"
+replies: "Ответы"
 renotes: "Репост"
+flip: "Переворот"
 _initialAccountSetting:
   accountCreated: "Аккаунт успешно создан!"
   letsStartAccountSetup: "Давайте настроим вашу учётную запись."
@@ -1074,6 +1079,9 @@ _initialAccountSetting:
   privacySetting: "Настройки конфиденциальности"
   initialAccountSettingCompleted: "Первоначальная настройка успешно завершена!"
   skipAreYouSure: "Пропустить настройку?"
+_initialTutorial:
+  _note:
+    description: "Посты в Misskey называются 'Заметками.' Заметки отсортированы в хронологическом порядке в ленте и обновляются в режиме реального времени."
 _serverSettings:
   iconUrl: "Адрес на иконку роли"
 _achievements:
@@ -1586,16 +1594,6 @@ _time:
   minute: "мин"
   hour: "ч"
   day: "сут"
-_timelineTutorial:
-  title: "Как пользоваться Misskey"
-  step1_1: "Это лицо Misskey, так называемая лента. Ваш инстанс, {name}, покажет тут все опубликованные на нём заметки в хронологическом порядке."
-  step1_2: "Здесь есть несколько лент. К примеру «персональная» лента отображает заметки тех, на кого вы подписаны. А «местная» — заметки тех, кого приютил {name}."
-  step2_1: "Что ж, теперь самое время опубликовать заметку. Если нажать вверху страницы на изображение карандаша, появится форма для текста."
-  step2_2: "Почему бы не написать немного о себе? Ну, или хотя бы «Привет, {name}»?"
-  step3_1: "Справились с первой заметкой?"
-  step3_2: "Отлично, теперь она должна появиться в вашей ленте."
-  step4_1: "А ещё здесь можно делиться своими реакциями на заметки."
-  step4_2: "Отмечайте реакции, нажимая на символ «+» под заметкой и выбирая значок по душе."
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
   registerTOTP: "Начните настраивать приложение-аутентификатор"
@@ -1901,7 +1899,7 @@ _notification:
     app: "Уведомления из приложений"
   _actions:
     followBack: "отвечает взаимной подпиской"
-    reply: "Ответить"
+    reply: "Ответ"
     renote: "Репост"
 _deck:
   alwaysShowMainColumn: "Всегда показывать главную колонку"

locales/sk-SK.yml

@@ -921,6 +921,7 @@ youFollowing: "Sledované"
 icon: "Avatar"
 replies: "Odpovedať"
 renotes: "Preposlať"
+flip: "Preklopiť"
 _role:
   priority: "Priorita"
   _priority:

locales/th-TH.yml

@@ -1117,15 +1117,26 @@ keepScreenOn: "เปิดหน้าจอไว้"
 notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต์ใหม่"
 unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
 authentication: "การตรวจสอบสิทธิ์"
+authenticationRequiredToContinue: "กรุณาตรวจสอบการรับรองความถูกต้องเพื่อดำเนินการต่อ"
 dateAndTime: "เวลาประทับ"
 showRenotes: "แสดงรีโน้ต"
 edited: "แก้ไขแล้ว"
 notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
 mutualFollow: "ติดตามซึ่งกันและกัน"
 fileAttachedOnly: "เฉพาะโน้ตที่มีไฟล์เท่านั้น"
+showRepliesToOthersInTimeline: "แสดงการตอบกลับไปยังอื่นๆในไทม์ไลน์"
+hideRepliesToOthersInTimeline: "ซ่อนการตอบกลับไปยังอื่นๆจากไทม์ไลน์"
+externalServices: "บริการภายนอก"
+impressum: "อิมเพรสชั่น"
+impressumUrl: "URL อิมเพรสชั่น"
+privacyPolicy: "นโยบายความเป็นส่วนตัว"
+privacyPolicyUrl: "URL นโยบายความเป็นส่วนตัว"
+tosAndPrivacyPolicy: "เงื่อนไขในการให้บริการและนโยบายความเป็นส่วนตัว"
+flip: "ย้อนกลับ"
 _announcement:
   forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
   forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
+  needConfirmationToRead: "จำเป็นต้องยืนยันเพื่อทำเครื่องหมายบอกว่าอ่านแล้ว"
   needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
   end: "ประกาศเก็บถาวร"
   tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
@@ -1143,13 +1154,14 @@ _initialAccountSetting:
   pushNotificationDescription: "กำลังเปิดใช้งานการแจ้งเตือนแบบพุชจะช่วยให้คุณได้รับการแจ้งเตือนจาก {name} โดยตรงบนอุปกรณ์ของคุณนะ"
   initialAccountSettingCompleted: "ตั้งค่าโปรไฟล์เสร็จสมบูรณ์แล้ว!"
   haveFun: "ขอให้สนุก {name}!"
-  ifYouNeedLearnMore: "ถ้าหากคุณต้องการเรียนรู้เพิ่มเติมเกี่ยวกับวิธีใช้ {ชื่อ} (Misskey) กรุณาไปที่ {link}"
   skipAreYouSure: "ต้องการข้ามการตั้งค่าโปรไฟล์จริงๆแบบนั้นหรอ?"
   laterAreYouSure: "ต้องการตั้งค่าโปรไฟล์ในภายหลังจริงๆอย่างงั้นหรอ?"
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _serverSettings:
   iconUrl: "ไอคอน URL"
+  appIconUsageExample: "E.g. เป็น PWA หรือเมื่อแสดงผลเป็นบุ๊กมาร์กหน้าจอหลักบนโทรศัพท์"
+  appIconResolutionMustBe: "ความละเอียดขั้นต่ำไว้คือ {resolution}."
   manifestJsonOverride: "manifest.json โอเวอร์ลาย"
   shortName: "ชื่อย่อ"
 _accountMigration:
@@ -1515,6 +1527,8 @@ _ad:
   reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
   hide: "ไม่ต้องแสดง"
   timezoneinfo: "วันในสัปดาห์นี้จะถูกกำหนดจากโซนเวลาของเซิร์ฟเวอร์"
+  adsSettings: "ตั้งค่าการโฆษณา"
+  setZeroToDisable: "ตั้งค่านี้ให้เป็น 0 เพื่อปิดใช้งานโฆษณาอัปเดตแบบเรียลไทม์"
 _forgotPassword:
   enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
   ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
@@ -1698,22 +1712,13 @@ _time:
   minute: "นาที"
   hour: "ชั่วโมง"
   day: "วัน"
-_timelineTutorial:
-  title: "วิธีใช้งาน Misskey"
-  step1_1: "นี่คือ \"ไทม์ไลน์\" \"โน้ต\" ทั้งหมดที่ส่งใน {name} จะแสดงรายการตามลำดับเวลาที่นี่นะ"
-  step1_2: "อาจจะมีไทม์ไลน์ที่แตกต่างกันเล็กน้อยยกตัวอย่างเช่น \"ไทม์ไลน์หน้าแรก\" จะมีโน้ตของผู้ใช้ที่คุณติดตามและ \"ไทม์ไลน์ท้องถิ่น\" จะมีโน้ตจากผู้ใช้ทั้งหมดของ {name}"
-  step2_1: "มาลองโพสต์โน้ตต่อไปกัน คุณสามารถทำได้โดยการกดปุ่มที่มีไอคอนดินสอ"
-  step2_2: "ยังไงไหนลองเขียนแนะนำตัวเองหรือแค่ \"สวัสดี {name}!\" ถ้าคุณไม่รู้สึกเหมือนมัน?"
-  step3_1: "เสร็จสิ้นการโพสต์โน้ตย่อแรกของคุณแล้วอย่างงั้นหรอ?"
-  step3_2: "ไชโย! ตอนนี้โน้ตย่อแรกของคุณได้ปรากฏบนไทม์ไลน์ของคุณแล้วนะ"
-  step4_1: "คุณสามารถเพิ่ม \"การตอบสนอง\" ในโน้ตได้"
-  step4_2: "หากต้องการแนบการแสดงความรู้สึก ให้กดเครื่องหมาย \"+\" บนโน้ตแล้วเลือกอิโมจิที่คุณต้องการแสดงความรู้สึกที่ตนเองชอบได้เลย"
 _2fa:
   alreadyRegistered: "คุณได้ลงทะเบียนอุปกรณ์ยืนยันตัวตนแบบ 2 ชั้นแล้ว"
   registerTOTP: "ลงทะเบียนแอพตัวตรวจสอบสิทธิ์"
   step1: "ขั้นตอนแรก ติดตั้งแอปยืนยันตัวตน (เช่น {a} หรือ {b}) บนอุปกรณ์ของคุณ"
   step2: "จากนั้นสแกนรหัส QR ที่แสดงบนหน้าจอนี้"
   step2Click: "การคลิกที่รหัส QR นี้จะช่วยให้คุณนั้นสามารถลงทะเบียน 2FA กับคีย์ความปลอดภัยหรือแอปตรวจสอบความถูกต้องของโทรศัพท์ได้"
+  step2Uri: "ป้อนใส่ URL ดังต่อไปนี้ถ้าหากคุณใช้โปรแกรมเดสก์ท็อป"
   step3Title: "ป้อนรหัสยืนยัน"
   step3: "ป้อนโทเค็นที่แอปของคุณให้มาเพื่อเสร็จสิ้นการตั้งค่า"
   setupCompleted: "ตั้งค่าสำเร็จแล้ว"
@@ -1732,6 +1737,8 @@ _2fa:
   renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
   renewTOTPCancel: "ไม่เป็นไร"
   backupCodes: "รหัสสำรองข้อมูล"
+  backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีก"
+  backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้ว ถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะยังไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
 _permissions:
   "read:account": "ดูข้อมูลบัญชีของคุณ"
   "write:account": "แก้ไขข้อมูลบัญชีของคุณ"
@@ -1894,6 +1901,7 @@ _exportOrImport:
   userLists: "รายการ"
   excludeMutingUsers: "ยกเว้นผู้ใช้ที่ปิดเสียง"
   excludeInactiveUsers: "ยกเว้นผู้ใช้ที่ไม่ได้ใช้งาน"
+  withReplies: "รวมการตอบกลับจากผู้ใช้ที่นำเข้าไว้ในไทม์ไลน์"
 _charts:
   federation: "สหพันธ์"
   apRequest: "คำขอ"
@@ -2114,3 +2122,11 @@ _moderationLogTypes:
   createAd: "สร้างโฆษณาแล้ว"
   deleteAd: "ลบโฆษณาออกแล้ว"
   updateAd: "อัปเดตโฆษณาแล้ว"
+_fileViewer:
+  title: "รายละเอียดไฟล์"
+  type: "ประเภทไฟล์"
+  size: "ขนาดไฟล์"
+  url: "URL"
+  uploadedAt: "วันที่เข้าร่วม"
+  attachedNotes: "โน้ตที่แนบมาด้วย"
+  thisPageCanBeSeenFromTheAuthor: "หน้าเพจนี้จะสามารถปรากฏได้โดยผู้ใช้ที่อัปโหลดไฟล์นี้เท่านั้น"

locales/tr-TR.yml

@@ -9,6 +9,7 @@ notifications: "Bildirim"
 username: "Kullanıcı Adı"
 password: "Şifre"
 forgotPassword: "şifremi unuttum"
+fetchingAsApObject: "從聯邦宇宙取得中..."
 ok: "TAMAM"
 gotIt: "Anladım"
 cancel: "İptal"
@@ -44,6 +45,7 @@ pin: "Sabitlenmiş"
 unpin: "Sabitlemeyi kaldır"
 copyContent: "İçeriği kopyala"
 copyLink: "Bağlantıyı Kopyala"
+copyLinkRenote: "Turkish"
 delete: "Sil"
 deleteAndEdit: "Sil ve yeniden düzenle"
 deleteAndEditConfirm: "Bu notu silip yeniden düzenlemek istiyor musunuz? Bu nota ilişkin tüm Tepkiler, Yeniden Notlar ve Yanıtlar da silinecektir."
@@ -155,6 +157,7 @@ addEmoji: "Emoji ekle"
 settingGuide: "Önerilen ayarlar"
 cacheRemoteFiles: "Uzak dosyalar ön belleğe alınsın"
 cacheRemoteFilesDescription: "Bu ayar açık olduğunda diğer sitelerin dosyaları doğrudan uzak sunucudan yüklenecektir. Bu ayarı kapatmak depolama kullanımını azaltacak ama küçük resimler oluşturulmadığından trafiği arttıracaktır."
+youCanCleanRemoteFilesCache: ""
 cacheRemoteSensitiveFiles: "Hassas uzak dosyalar ön belleğe alınsın"
 cacheRemoteSensitiveFilesDescription: "Bu ayar kapalı olduğunda hassas uzak dosyalar ön belleğe alınmadan doğrudan uzak sunucudan yüklenecektir."
 flagAsBot: "Bot olarak işaretle"
@@ -192,6 +195,7 @@ perHour: "Saatlik"
 perDay: "Günlük"
 stopActivityDelivery: "Durum güncellemelerini gönderme"
 blockThisInstance: "Bu sunucuyu engelle"
+silenceThisInstance: ""
 operations: "İşlemler"
 software: "Yazılımlar"
 version: "Sürüm"
@@ -211,6 +215,8 @@ clearCachedFiles: "Ön belleği temizle"
 clearCachedFilesConfirm: "Ön belleğe alınmış tüm uzak sunucu dosyaları silinsin mi?"
 blockedInstances: "Engellenen sunucular"
 blockedInstancesDescription: "Engellemek istediğiniz sunucuların alan adlarını satır sonlarıyla ayırarak yazın. Yazılan sunucular bu sunucuyla iletişime geçemeyecek."
+silencedInstances: "Turkısh"
+silencedInstancesDescription: ""
 muteAndBlock: "Susturma ve Engelleme"
 mutedUsers: "Susturulan kullanıcılar"
 blockedUsers: "Engellenen kullanıcılar"

locales/ug-CN.yml

@@ -1,4 +1,19 @@
 ---
 _lang_: "ياپونچە"
+headlineMisskey: "خاتىرە ئارقىلىق ئۇلانغان تور"
+monthAndDay: "{day}-{month}"
 search: "ئىزدەش"
+ok: "ماقۇل"
+noThankYou: "ئۇنى توختىتىڭ"
+profile: "profile"
+login: "كىرىش"
+loggingIn: "كىرىش"
+pin: "pinned"
+delete: "ئۆچۈرۈش"
+pinned: "pinned"
+remove: "ئۆچۈرۈش"
 searchByGoogle: "ئىزدەش"
+_2fa:
+  renewTOTPCancel: "ئۇنى توختىتىڭ"
+_widgets:
+  profile: "profile"

locales/uk-UA.yml

@@ -907,6 +907,7 @@ youFollowing: "Підписки"
 icon: "Аватар"
 replies: "Відповісти"
 renotes: "Поширити"
+flip: "Перевернути"
 _achievements:
   earnedAt: "Відкрито"
   _types:

locales/uz-UZ.yml

@@ -845,6 +845,7 @@ sensitiveWords: "Ta'sirchan so'zlar"
 icon: "Avatar"
 replies: "Javob berish"
 renotes: "Qayta qayd etish"
+flip: "Teskari"
 _achievements:
   _types:
     _viewInstanceChart:

locales/vi-VN.yml

@@ -1047,6 +1047,7 @@ loadReplies: "Hiển thị các trả lời"
 pinnedList: "Các mục đã được ghim"
 keepScreenOn: "Giữ màn hình luôn bật"
 verifiedLink: "Chúng tôi đã xác nhận bạn là chủ sở hữu của đường dẫn này"
+flip: "Lật"
 _announcement:
   forExistingUsers: "Chỉ những người dùng đã tồn tại"
   forExistingUsersDescription: "Nếu được bật, thông báo này sẽ chỉ hiển thị với những người dùng đã tồn tại vào lúc thông báo được tạo. Nếu tắt đi, những tài khoản mới đăng ký sau khi thông báo được đăng lên cũng sẽ thấy nó."
@@ -1066,7 +1067,6 @@ _initialAccountSetting:
   pushNotificationDescription: "Bật thông báo đẩy sẽ cho phép bạn nhận thông báo từ {name} trực tiếp từ thiết bị của bạn."
   initialAccountSettingCompleted: "Thiết lập tài khoản thành công!"
   haveFun: "Hãy tận hưởng {name} nhé!"
-  ifYouNeedLearnMore: "Nếu bạn muốn tìm hiểu thêm về cách sử dụng {name} (Misskey), hãy vào {link}."
   skipAreYouSure: "Bạn thực sự muốn bỏ qua mục thiết lập tài khoản?"
   laterAreYouSure: "Bạn thực sự muốn thiết lập tài khoản vào lúc khác?"
 _serverSettings:
@@ -1502,9 +1502,6 @@ _time:
   minute: "phút"
   hour: "giờ"
   day: "ngày"
-_timelineTutorial:
-  step4_1: "Bạn có thể thêm \"Reaction\" vào ghi chú"
-  step4_2: "Khi thêm biểu cảm hãy nhấn dấu \"+\""
 _2fa:
   alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
   registerTOTP: "Đăng ký ứng dụng xác thực"

locales/zh-CN.yml

@@ -195,6 +195,7 @@ perHour: "每小时"
 perDay: "每天"
 stopActivityDelivery: "停止发送活动"
 blockThisInstance: "阻止此服务器向本服务器推流"
+silenceThisInstance: "使服务器静音"
 operations: "操作"
 software: "软件"
 version: "版本"
@@ -214,6 +215,8 @@ clearCachedFiles: "清除缓存"
 clearCachedFilesConfirm: "确定要清除缓存文件？"
 blockedInstances: "被封锁的服务器"
 blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
+silencedInstances: "沉默的服务器"
+silencedInstancesDescription: "设置要静音的服务器的主机，以换行符分隔。属于静默服务器的所有帐户都将被视为“静默”，所有关注都将成为请求，并且您将无法提及非关注者的本地帐户。被阻止的实例不受影响。"
 muteAndBlock: "屏蔽/拉黑"
 mutedUsers: "已屏蔽用户"
 blockedUsers: "已拉黑的用户"
@@ -1128,6 +1131,7 @@ mutualFollow: "互相关注"
 fileAttachedOnly: "仅限媒体"
 showRepliesToOthersInTimeline: "在时间线上显示给其他人的回复"
 hideRepliesToOthersInTimeline: "在时间线上隐藏给其他人的回复"
+flip: "翻转"
 _announcement:
   forExistingUsers: "仅限现有用户"
   forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。"
@@ -1149,7 +1153,6 @@ _initialAccountSetting:
   pushNotificationDescription: "启用推送通知的话，就可以在设备上接收来自 {name} 的通知了。"
   initialAccountSettingCompleted: "初始设定已经完成了！"
   haveFun: "希望 {name} 在这里玩得开心！"
-  ifYouNeedLearnMore: "关于 {name}(Misskey) 的使用方法，详见 {link}。"
   skipAreYouSure: "要跳过初始设置吗？"
   laterAreYouSure: "要稍后再进行初始设定吗？"
 _serverRules:
@@ -1708,16 +1711,6 @@ _time:
   minute: "分"
   hour: "小时"
   day: "日"
-_timelineTutorial:
-  title: "Misskey 的使用方法"
-  step1_1: "这个画面是「时间线」。{name}的投稿会按照帖子的发布时间顺序来显示。"
-  step1_2: "时间线有许多种类，比如在「首页时间线」中展现的是你关注的人的贴文；而在「本地时间线」中展现的是{name}里全部用户的贴文。"
-  step2_1: "那么接下来，试着写一些什么东西来发布吧！你可以通过点击屏幕上的铅笔图标来打开投稿页面。"
-  step2_2: "第一次发布的帖子内容，建议包含自我介绍，以及「开始使用{name}了」。"
-  step3_1: "将想说的话发出去了吗？"
-  step3_2: "太棒了！现在你可以在你的时间线中看到刚刚发布的帖子了。"
-  step4_1: "试着对帖子使用「回应」吧！"
-  step4_2: "在他人的帖子上按下「+」图标，即可选择想要的表情来进行「回应」。"
 _2fa:
   alreadyRegistered: "此设备已被注册"
   registerTOTP: "开始设置认证应用"
@@ -2127,3 +2120,6 @@ _moderationLogTypes:
   createAd: "创建了广告"
   deleteAd: "删除了广告"
   updateAd: "更新了广告"
+_fileViewer:
+  url: "URL"
+  uploadedAt: "添加日期"

locales/zh-TW.yml

@@ -161,7 +161,7 @@ youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，可將快取全
 cacheRemoteSensitiveFiles: "快取遠端的敏感檔案"
 cacheRemoteSensitiveFilesDescription: "若停用這個設定，則不會快取遠端的敏感檔案，而是直接連結。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整 Misskey 內部系統將本帳戶識別為機器人。"
 flagAsCat: "此帳戶是一隻貓，喵～～～！！！"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
@@ -195,6 +195,7 @@ perHour: "每小時"
 perDay: "每日"
 stopActivityDelivery: "停止發送活動"
 blockThisInstance: "封鎖此伺服器"
+silenceThisInstance: "禁言此伺服器"
 operations: "操作"
 software: "軟體"
 version: "版本"
@@ -214,6 +215,8 @@ clearCachedFiles: "清除快取資料"
 clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
 blockedInstances: "已封鎖的伺服器"
 blockedInstancesDescription: "請逐行輸入需要封鎖的伺服器。已封鎖的伺服器將無法與本伺服器進行通訊。"
+silencedInstances: "被禁言的伺服器"
+silencedInstancesDescription: "設定要禁言的伺服器主機名稱，以換行分隔。隸屬於禁言伺服器的所有帳戶都將被視為「禁言帳戶」，只能發出「追隨請求」，而且無法提及未追隨的本地帳戶。這不會影響已封鎖的實例。"
 muteAndBlock: "靜音和封鎖"
 mutedUsers: "被靜音的使用者"
 blockedUsers: "被封鎖的使用者"
@@ -296,7 +299,7 @@ light: "淺色"
 dark: "深色"
 lightThemes: "淺色主題"
 darkThemes: "深色主題"
-syncDeviceDarkMode: "同步至此裝置的深色模式設定"
+syncDeviceDarkMode: "與設備的深色模式同步"
 drive: "雲端硬碟"
 fileName: "檔案名稱"
 selectFile: "選擇檔案"
@@ -531,6 +534,7 @@ serverLogs: "伺服器日誌"
 deleteAll: "刪除所有記錄"
 showFixedPostForm: "於時間軸頁頂顯示「發送貼文」方框"
 showFixedPostFormInChannel: "於時間軸頁頂顯示「發送貼文」方框（頻道）"
+withRepliesByDefaultForNewlyFollowed: "在追隨其他人後，預設在時間軸納入回覆的貼文"
 newNoteRecived: "發現新貼文"
 sounds: "音效"
 sound: "音效"
@@ -580,7 +584,7 @@ relays: "中繼"
 addRelay: "新增中繼"
 inboxUrl: "收件夾URL"
 addedRelays: "已加入的中繼"
-serviceworkerInfo: "您需要啟用推送通知。"
+serviceworkerInfo: "如要使用推播通知，需要啟用此選項並設定金鑰。"
 deletedNote: "已刪除的貼文"
 invisibleNote: "私密的貼文"
 enableInfiniteScroll: "啟用自動滾動頁面模式"
@@ -727,7 +731,7 @@ thisIsExperimentalFeature: "這是實驗性的功能。可能會有變更規格
 developer: "開發者"
 makeExplorable: "使自己的帳戶能夠在「探索」頁面中顯示"
 makeExplorableDescription: "如果關閉，帳戶將不會被顯示在「探索」頁面中。"
-showGapBetweenNotesInTimeline: "分開顯示時間軸上的貼文。"
+showGapBetweenNotesInTimeline: "分開顯示時間軸上的貼文"
 duplicate: "複製"
 left: "左"
 center: "置中"
@@ -975,6 +979,7 @@ assign: "指派"
 unassign: "取消指派"
 color: "顏色"
 manageCustomEmojis: "管理自訂表情符號"
+manageAvatarDecorations: "管理頭像裝飾"
 youCannotCreateAnymore: "您無法再建立更多了。"
 cannotPerformTemporary: "暫時無法進行"
 cannotPerformTemporaryDescription: "由於超過操作次數限制，因此暫時無法進行。請稍後再嘗試。"
@@ -1025,8 +1030,8 @@ retryAllQueuesConfirmTitle: "要現在重試嗎？"
 retryAllQueuesConfirmText: "伺服器的負荷可能會暫時增加。"
 enableChartsForRemoteUser: "生成遠端使用者的圖表"
 enableChartsForFederatedInstances: "生成遠端伺服器的圖表"
-showClipButtonInNoteFooter: "新增摘錄至貼文"
-reactionsDisplaySize: "表情回應的顯示尺寸"
+showClipButtonInNoteFooter: "新增摘錄按鈕至貼文"
+reactionsDisplaySize: "反應的顯示尺寸"
 noteIdOrUrl: "貼文ID或URL"
 video: "影片"
 videos: "影片"
@@ -1121,13 +1126,17 @@ unnotifyNotes: "關閉貼文通知"
 authentication: "驗證"
 authenticationRequiredToContinue: "請於繼續前完成驗證"
 dateAndTime: "日期與時間"
-showRenotes: "顯示轉發貼文"
+showRenotes: "顯示其他人的轉發貼文"
 edited: "已編輯"
 notificationRecieveConfig: "接受通知的設定"
 mutualFollow: "互相追隨"
-fileAttachedOnly: "包含附件"
-showRepliesToOthersInTimeline: "在時間軸上顯示給其他人的回覆"
+fileAttachedOnly: "顯示包含附件的貼文"
+showRepliesToOthersInTimeline: "顯示給其他人的回覆"
 hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆"
+showRepliesToOthersInTimelineAll: "在時間軸包含追隨中所有人的回覆"
+hideRepliesToOthersInTimelineAll: "在時間軸不包含追隨中所有人的回覆"
+confirmShowRepliesAll: "進行此操作後無法復原。您真的希望時間軸「包含」您目前追隨的所有人的回覆嗎？"
+confirmHideRepliesAll: "進行此操作後無法復原。您真的希望時間軸「不包含」您目前追隨的所有人的回覆嗎？"
 externalServices: "外部服務"
 impressum: "營運者資訊"
 impressumUrl: "營運者資訊網址"
@@ -1135,6 +1144,20 @@ impressumDescription: "在德國與部份地區必須要明確顯示營運者資
 privacyPolicy: "隱私政策"
 privacyPolicyUrl: "隱私政策網址"
 tosAndPrivacyPolicy: "服務條款和隱私政策"
+avatarDecorations: "頭像裝飾"
+attach: "裝上"
+detach: "取下"
+angle: "角度"
+flip: "翻轉"
+showAvatarDecorations: "顯示頭像裝飾"
+releaseToRefresh: "放開以更新內容"
+refreshing: "載入更新中"
+pullDownToRefresh: "往下拉來更新內容"
+disableStreamingTimeline: "停用時間軸的即時更新"
+useGroupedNotifications: "分組顯示通知訊息"
+signupPendingError: "驗證您的電子郵件地址時出現問題。連結可能已過期。"
+cwNotationRequired: "如果開啟「隱藏內容」，則需要註解說明。"
+doReaction: "做出反應"
 _announcement:
   forExistingUsers: "僅限既有的使用者"
   forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。"
@@ -1144,6 +1167,10 @@ _announcement:
   tooManyActiveAnnouncementDescription: "有過多公告可能會影響使用者體驗。請考慮歸檔已結束的公告。"
   readConfirmTitle: "標記為已讀嗎？"
   readConfirmText: "閱讀「{title}」的內容並標記為已讀。"
+  shouldNotBeUsedToPresentPermanentInfo: "由於可能會破壞使用者體驗，尤其是對於新使用者而言，我們建議使用公告來發布有時效性的資訊而不是固定不變的資訊。"
+  dialogAnnouncementUxWarn: "如果同時有 2 個以上對話方塊形式的公告存在，對於使用者體驗很可能會有不良的影響，因此建議謹慎使用。"
+  silence: "不發送通知"
+  silenceDescription: "啟用此選項後，將不會發送此公告的通知，並且無需將其標記為已讀。"
 _initialAccountSetting:
   accountCreated: "帳戶已建立完成！"
   letsStartAccountSetup: "來進行帳戶的初始設定吧。"
@@ -1156,9 +1183,77 @@ _initialAccountSetting:
   pushNotificationDescription: "啟用推送通知，就可以在設備上接收{name}的通知。"
   initialAccountSettingCompleted: "初始設定完成了！"
   haveFun: "盡情享受{name}吧！"
-  ifYouNeedLearnMore: "請瀏覽{link}以更瞭解{name}（Misskey）的使用方法。"
+  youCanContinueTutorial: "您可以繼續學習如何使用{name}(Misskey)，也可以就此打住，立即開始使用。"
+  startTutorial: "開始教學課程"
   skipAreYouSure: "要略過初始設定嗎？"
   laterAreYouSure: "稍後再重新進行初始設定嗎？"
+_initialTutorial:
+  launchTutorial: "觀看教學課程"
+  title: "新手教學"
+  wellDone: "做得好"
+  skipAreYouSure: "結束教學模式？"
+  _landing:
+    title: "歡迎使用本教學課程"
+    description: "在這裡您可以查看Misskey的基本使用方法和功能。"
+  _note:
+    title: "什麼是貼文？"
+    description: "在Misskey上發布的內容稱為「貼文」。貼文在時間軸上按時間順序排列，並即時更新。"
+    reply: "您可以回覆貼文，並像討論串一樣繼續對話。"
+    renote: "您可以將此貼文分享到自己的時間軸。您也可以在引用時添加文字。"
+    reaction: "您可以添加反應。詳細資訊將在下一頁進行說明。"
+    menu: "可執行各種操作，如查看貼文詳細資訊和複製連結。"
+  _reaction:
+    title: "什麼是反應？"
+    description: "您可以在貼文中添加「反應」。您可以使用反應輕鬆隨意地表達「最愛/大心」所無法傳達的細微差別。"
+    letsTryReacting: "可以透過點擊貼文上的「+」按鈕來添加反應。請嘗試在此範例貼文添加反應！"
+    reactToContinue: "添加反應以繼續教學課程。"
+    reactNotification: "當有人對您的貼文做出反應時會即時接收到通知。"
+    reactDone: "按下「-」按鈕可以取消反應。"
+  _timeline:
+    title: "時間軸如何運作"
+    description1: "Misskey根據使用方式提供了多個時間軸（伺服器可能會將部份時間軸停用）。"
+    home: "您可以查看您追隨的使用者的貼文。"
+    local: "您可以看到此伺服器上所有使用者的貼文。"
+    social: "來自首頁時間軸和本地時間軸的貼文都會顯示。"
+    global: "可以看到其他已連接伺服器的貼文。"
+    description2: "您可以隨時在螢幕上方切換對應的時間軸。"
+    description3: "除此之外還有清單時間軸、頻道時間軸等。請參閱{link}以了解更多詳情。"
+  _postNote:
+    title: "貼文的發布設定"
+    description1: "在Misskey上發布貼文時，可以設定各種選項。發布表單如下所示。"
+    _visibility:
+      description: "可以限制誰可以看到您的貼文。"
+      public: "所有人都可以看見。"
+      home: "僅在首頁時間軸上發布。其他使用者只在下列情況可看見該貼文：追隨者、觀看使用者的個人資料頁面，以及貼文被轉發時。"
+      followers: "僅追隨者可見。只有發文者本人可轉發，未追隨發文者的使用者無法看見。"
+      direct: "僅指定的使用者可見，對方也會收到通知。可代替直接訊息使用。"
+      doNotSendConfidencialOnDirect1: "發送機密訊息時請務必注意。"
+      doNotSendConfidencialOnDirect2: "目標伺服器的管理員可以看到發布的內容，因此如果您向不受信任的伺服器上的使用者發送直接訊息，必須小心處理機密訊息。"
+      localOnly: "不將貼文發布到聯邦上的其他伺服器。不論上述發布範圍，使用此設定後，其他伺服器上的使用者將無法直接查看此貼文。"
+    _cw:
+      title: "隱藏內容（CW）"
+      description: "將顯示「註釋」中寫入的內容而不是本文。按一下「顯示內容」以顯示本文。"
+      _exampleNote:
+        cw: "美食恐怖主義注意"
+        note: "我吃了一個巧克力甜甜圈🍩😋"
+      useCases: "伺服器的服務條款可能會規範特定的貼文需要使用隱藏內容，除此之外也會用在隱藏劇情洩漏與敏感內容的貼文。"
+  _howToMakeAttachmentsSensitive:
+    title: "如何標記上傳附件為敏感內容？"
+    description: "如果伺服器服務條款有規範，又或者不希望上傳附件直接被看見，可以設置為「敏感內容」"
+    tryThisFile: "試試看！把附加在發文表單的圖像檔案標記為敏感內容。"
+    _exampleNote:
+      note: "打開納豆的包裝失敗了…"
+    method: "若要使上傳附件標記為敏感內容，請按一下該檔案以開啟選單，然後點擊「標記為敏感內容」。"
+    sensitiveSucceeded: "上傳附件時，請務必根據伺服器的服務條款適當設定敏感內容。"
+    doItToContinue: "把圖像標記為敏感內容以繼續教學課程。"
+  _done:
+    title: "教學課程已結束"
+    description: "這裡介紹的功能只是其中的一小部分。要了解更多有關如何使用Misskey的資訊，請瀏覽{link}。"
+_timelineDescription:
+  home: "在首頁時間軸上，可以看到您追隨的使用者的貼文。"
+  local: "在本地時間軸上，可以看到此伺服器所有使用者的貼文。"
+  social: "在社交時間軸上，可以看到首頁與本地時間軸的貼文。"
+  global: "在公開時間軸上，可以看到其他已連接伺服器的貼文。\n"
 _serverRules:
   description: "設定在註冊頁面顯示的伺服器簡要規則。建議是服務條款的摘要。"
 _serverSettings:
@@ -1170,6 +1265,9 @@ _serverSettings:
   manifestJsonOverride: "覆寫 manifest.json"
   shortName: "簡稱"
   shortNameDescription: "如果伺服器的正式名稱很長，可用簡稱或通稱代替。"
+  fanoutTimelineDescription: "如果啟用的話，檢索各個時間軸的性能會顯著提昇，資料庫的負荷也會減少。不過，Redis 的記憶體使用量會增加。如果伺服器的記憶體容量比較少或者運行不穩定，可以停用。"
+  fanoutTimelineDbFallback: "資料庫的回退"
+  fanoutTimelineDbFallbackDescription: "若啟用，在時間軸沒有快取的情況下將執行回退處理以額外查詢資料庫。若停用，可以透過不執行回退處理來進一步減少伺服器的負荷，但會限制可取得的時間軸範圍。"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
   moveFromSub: "為另一個帳戶建立別名"
@@ -1178,7 +1276,7 @@ _accountMigration:
   moveTo: "將這個帳戶遷移至新的帳戶"
   moveToLabel: "要遷移到的帳戶："
   moveCannotBeUndone: "一旦遷移帳戶，就無法取消。"
-  moveAccountDescription: "遷移至新帳戶。\n　・此帳戶的追隨者將自動追隨新帳戶；\n　・此帳戶的所有追隨者將被取消追隨；\n　・此帳戶不能再發文。\n\n雖然會自動遷移您追隨者，但必須手動遷移您追隨的帳戶。請在遷移前匯出此帳戶的「追隨中」名單，並在遷移後自行匯入。\n列表名單、靜音名單及封鎖名單也必須如此處理。\n\n（此說明適用於本伺服器，以及運行 Misskey v13.12.0 或更新版本的其他伺服器；如 Mastodon 等使用 ActivityPub 協定的其他軟體或有不同的處理方式。）"
+  moveAccountDescription: "遷移至新帳戶。\n　・此帳戶的追隨者將自動追隨新帳戶；\n　・此帳戶的所有追隨者將被取消追隨；\n　・此帳戶不能再發文。\n\n雖然會自動遷移您的追隨者，但必須手動遷移您追隨的帳戶。請在遷移前匯出此帳戶的「追隨中」名單，並在遷移後自行匯入。\n列表名單、靜音名單及封鎖名單也必須如此處理。\n\n（此說明適用於本伺服器，以及運行 Misskey v13.12.0 或更新版本的其他伺服器；如 Mastodon 等使用 ActivityPub 協定的其他軟體或有不同的處理方式。）"
   moveAccountHowTo: "要遷移帳戶，首先要在目標帳戶中為此帳戶建立一個別名。\n 建立別名後，像這樣輸入目標帳戶：@username@server.example.com"
   startMigration: "遷移"
   migrationConfirm: "確定要將這個帳戶遷移至 {account} 嗎？一旦遷移就無法撤銷，也就無法以原來的狀態使用這個帳戶。\n另外，請確認在要遷移到的帳戶已經建立了一個別名。"
@@ -1427,6 +1525,9 @@ _achievements:
     _smashTestNotificationButton:
       title: "過度測試"
       description: "極短時間內連續測試通知"
+    _tutorialCompleted:
+      title: "Misskey新手講座 結業證書"
+      description: "已完成教學課程"
 _role:
   new: "建立角色"
   edit: "編輯角色"
@@ -1470,6 +1571,7 @@ _role:
     inviteLimitCycle: "邀請碼的發放間隔"
     inviteExpirationTime: "邀請碼的有效日期"
     canManageCustomEmojis: "管理自訂表情符號"
+    canManageAvatarDecorations: "管理頭像裝飾"
     driveCapacity: "雲端硬碟容量"
     alwaysMarkNsfw: "總是將檔案標記為NSFW"
     pinMax: "置頂貼文的最大數量"
@@ -1589,6 +1691,7 @@ _aboutMisskey:
   donate: "贊助 Misskey"
   morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
   patrons: "贊助者"
+  projectMembers: "專案成員"
 _displayOfSensitiveMedia:
   respect: "隱藏敏感檔案"
   ignore: "顯示敏感檔案"
@@ -1613,6 +1716,7 @@ _channel:
   notesCount: "有 {n} 篇貼文"
   nameAndDescription: "名稱與說明"
   nameOnly: "僅名稱"
+  allowRenoteToExternal: "允許在頻道外轉發和引用"
 _menuDisplay:
   sideFull: "橫向"
   sideIcon: "橫向（圖示）"
@@ -1623,7 +1727,7 @@ _wordMute:
   muteWordsDescription: "空格代表「以及」（AND），換行代表「或者」（OR）。"
   muteWordsDescription2: "用斜線包圍關鍵字代表正規表達式。"
 _instanceMute:
-  instanceMuteDescription: "包括對被靜音實例上的使用者的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
+  instanceMuteDescription: "包括對被靜音伺服器上的使用者的回覆，被設定的伺服器上所有貼文及轉發都會被靜音。"
   instanceMuteDescription2: "設定時以換行進行分隔"
   title: "將隱藏被設定的實例貼文。"
   heading: "將實例靜音"
@@ -1715,21 +1819,19 @@ _ago:
   monthsAgo: "{n} 個月前"
   yearsAgo: "{n} 年前"
   invalid: "無"
+_timeIn:
+  seconds: "{n} 秒後"
+  minutes: "{n} 分後"
+  hours: "{n} 小時後"
+  days: "{n} 日後"
+  weeks: "{n} 週後"
+  months: "{n} 個月後"
+  years: "{n} 年後"
 _time:
   second: "秒"
   minute: "分鐘"
   hour: "小時"
   day: "日"
-_timelineTutorial:
-  title: "Misskey 的使用方法"
-  step1_1: "這個畫面是「時間軸」。發佈到{name}的「貼文」會按照時間順序顯示。"
-  step1_2: "時間軸有多種類型，例如「首頁時間軸」是您追蹤帳戶的貼文、「本地時間軸」是{name}內所有帳戶的貼文。"
-  step2_1: "不如現在就嘗試發文吧！按鉛筆圖示的按鈕開啟發文頁面。"
-  step2_2: "您可以在第一篇貼文裡寫自我介紹，或是「我來到 {name} 了」之類的話。"
-  step3_1: "貼文發出去了嗎？"
-  step3_2: "如果您的貼文出現在時間軸上，就代表發文成功。"
-  step4_1: "可以對貼文標記「反應」。"
-  step4_2: "點擊貼文的「+」圖示，即可選擇表情符號來反應。"
 _2fa:
   alreadyRegistered: "此裝置已被註冊過了"
   registerTOTP: "開始設定驗證應用程式"
@@ -1852,7 +1954,7 @@ _widgets:
   clicker: "點擊器"
 _cw:
   hide: "隱藏"
-  show: "瀏覽更多"
+  show: "顯示內容"
   chars: "{count} 個字元"
   files: "{count} 個檔案"
 _poll:
@@ -1921,6 +2023,7 @@ _exportOrImport:
   userLists: "清單"
   excludeMutingUsers: "排除被靜音的使用者"
   excludeInactiveUsers: "排除不活躍帳戶"
+  withReplies: "將被匯入的追隨中清單的貼文回覆包含在時間軸"
 _charts:
   federation: "聯邦宇宙"
   apRequest: "請求"
@@ -2038,6 +2141,9 @@ _notification:
   checkNotificationBehavior: "確認通知的顯示行為"
   sendTestNotification: "發送測試通知"
   notificationWillBeDisplayedLikeThis: "通知會以這樣的方式顯示"
+  reactedBySomeUsers: "{n}人做出了反應"
+  renotedBySomeUsers: "{n}人做了轉發"
+  followedBySomeUsers: "被{n}人追隨了"
   _types:
     all: "全部 "
     note: "使用者的最新貼文"
@@ -2141,6 +2247,9 @@ _moderationLogTypes:
   createAd: "建立廣告"
   deleteAd: "刪除廣告"
   updateAd: "更新廣告"
+  createAvatarDecoration: "建立頭像裝飾"
+  updateAvatarDecoration: "更新頭像裝飾"
+  deleteAvatarDecoration: "刪除頭像裝飾"
 _fileViewer:
   title: "檔案詳細資訊"
   type: "檔案類型 "
@@ -2149,3 +2258,44 @@ _fileViewer:
   uploadedAt: "加入日期"
   attachedNotes: "含有附件的貼文"
   thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"
+_externalResourceInstaller:
+  title: "從外部網站安裝"
+  checkVendorBeforeInstall: "安裝前請確認提供者是可信賴的。"
+  _plugin:
+    title: "要安裝此外掛嘛？"
+    metaTitle: "外掛資訊"
+  _theme:
+    title: "要安裝此外觀主題嘛？"
+    metaTitle: "外觀主題資訊"
+  _meta:
+    base: "基本配色方案"
+  _vendorInfo:
+    title: "提供者資訊"
+    endpoint: "引用端點"
+    hashVerify: "確認檔案的完整性"
+  _errors:
+    _invalidParams:
+      title: "缺少參數"
+      description: "缺少從外部網站取得資料的必要資訊。請檢查 URL 是否正確。"
+    _resourceTypeNotSupported:
+      title: "不支援此外部資源。"
+      description: "不支援從此外部網站取得的資源類型。請聯絡網站管理員。"
+    _failedToFetch:
+      title: "無法取得資料"
+      fetchErrorDescription: "與外部站點的通訊失敗。如果重試後問題仍然存在，請聯絡網站管理員。"
+      parseErrorDescription: "無法讀取從外部站點取得的資料。請聯絡網站管理員。"
+    _hashUnmatched:
+      title: "無法取得正確資料"
+      description: "所提供資料的完整性驗證失敗。出於安全原因，安裝無法繼續。請聯絡網站管理員。"
+    _pluginParseFailed:
+      title: "AiScript 錯誤"
+      description: "已取得資料但解析 AiScript 時發生錯誤，導致無法載入。請聯絡外掛作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。"
+    _pluginInstallFailed:
+      title: "外掛安裝失敗"
+      description: "安裝插件時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。"
+    _themeParseFailed:
+      title: "外觀主題解析錯誤"
+      description: "已取得資料但解析外觀主題時發生錯誤，導致無法載入。請聯絡主題作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。"
+    _themeInstallFailed:
+      title: "無法安裝外觀主題"
+      description: "安裝外觀主題時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2023.10.2-beta.1",
+	"version": "2023.12.0-beta.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@8.9.2",
+	"packageManager": "pnpm@8.10.5",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -18,14 +18,16 @@
 		"build-assets": "node ./scripts/build-assets.mjs",
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
+		"build-misskey-js-with-types": "pnpm --filter backend build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
 		"migrate": "cd packages/backend && pnpm migrate",
+		"revert": "cd packages/backend && pnpm revert",
 		"check:connect": "cd packages/backend && pnpm check:connect",
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"watch": "pnpm dev",
-		"dev": "node ./scripts/dev.mjs",
+		"dev": "pnpm -r dev",
 		"lint": "pnpm -r lint",
 		"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
 		"cy:run": "pnpm cypress run",
@@ -46,17 +48,18 @@
 		"execa": "8.0.1",
 		"cssnano": "6.0.1",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.31",
-		"terser": "5.21.0",
-		"typescript": "5.2.2"
+		"postcss": "8.4.32",
+		"terser": "5.24.0",
+		"typescript": "5.3.3"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "6.8.0",
-		"@typescript-eslint/parser": "6.8.0",
+		"@typescript-eslint/eslint-plugin": "6.14.0",
+		"@typescript-eslint/parser": "6.14.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.1",
-		"eslint": "8.51.0",
-		"start-server-and-test": "2.0.1"
+		"cypress": "13.6.1",
+		"eslint": "8.55.0",
+		"start-server-and-test": "2.0.3",
+		"ncp": "2.0.0"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.4.0"

packages/backend/.swcrc

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

packages/backend/generate_api_json.js

@@ -0,0 +1,8 @@
+import { loadConfig } from './built/config.js'
+import { genOpenapiSpec } from './built/server/api/openapi/gen-spec.js'
+import { writeFileSync } from "node:fs";
+
+const config = loadConfig();
+const spec = genOpenapiSpec(config);
+
+writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');

packages/backend/migration/1697673894459-note-reactionAndUserPairCache.js

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

packages/backend/migration/1697847397844-avatar-decoration.js

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AvatarDecoration1697847397844 {
+    name = 'AvatarDecoration1697847397844'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "avatar_decoration" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "url" character varying(1024) NOT NULL, "name" character varying(256) NOT NULL, "description" character varying(2048) NOT NULL, "roleIdsThatCanBeUsedThisDecoration" character varying(128) array NOT NULL DEFAULT '{}', CONSTRAINT "PK_b6de9296f6097078e1dc53f7603" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" character varying(512) array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
+        await queryRunner.query(`DROP TABLE "avatar_decoration"`);
+    }
+}

packages/backend/migration/1697941908548-avatar-decoration2.js

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AvatarDecoration21697941908548 {
+    name = 'AvatarDecoration21697941908548'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" jsonb NOT NULL DEFAULT '[]'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" character varying(512) array NOT NULL DEFAULT '{}'`);
+    }
+}

packages/backend/migration/1698041201306-enable-ftt.js

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

packages/backend/migration/1698840138000-add-allow-renote-to-external.js

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

packages/backend/migration/1699141698112-announcement-silence.js

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

packages/backend/migration/1700096812223-enableFanoutTimelineDbFallback.js

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

packages/backend/migration/1700303245007-supportVerifyMailApi.js

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

packages/backend/migration/1700383825690-hard-mute.js

@@ -0,0 +1,11 @@
+export class HardMute1700383825690 {
+    name = 'HardMute1700383825690'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "hardMutedWords" jsonb NOT NULL DEFAULT '[]'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "hardMutedWords"`);
+    }
+}

packages/backend/migration/1700902349231-add-bday-index.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddBdayIndex1700902349231 {
+    name = 'AddBdayIndex1700902349231'
+
+    async up(queryRunner) {
+      await queryRunner.query(`CREATE INDEX "IDX_de22cd2b445eee31ae51cdbe99" ON "user_profile" (SUBSTR("birthday", 6, 5))`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`DROP INDEX "public"."IDX_de22cd2b445eee31ae51cdbe99"`);
+    }
+}

packages/backend/package.json

@@ -7,14 +7,16 @@
 		"node": ">=18.16.0"
 	},
 	"scripts": {
-		"start": "node ./built/index.js",
-		"start:test": "NODE_ENV=test node ./built/index.js",
+		"start": "node ./built/boot/entry.js",
+		"start:test": "NODE_ENV=test node ./built/boot/entry.js",
 		"migrate": "pnpm typeorm migration:run -d ormconfig.js",
+		"revert": "pnpm typeorm migration:revert -d ormconfig.js",
 		"check:connect": "node ./check_connect.js",
 		"build": "swc src -d built -D",
 		"watch:swc": "swc src -d built -D -w",
 		"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
+		"dev": "node ./built/boot/entry.js",
 		"typecheck": "tsc --noEmit",
 		"eslint": "eslint --quiet \"src/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
@@ -22,7 +24,8 @@
 		"jest-and-coverage": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit",
 		"jest-clear": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --clearCache",
 		"test": "pnpm jest",
-		"test-and-coverage": "pnpm jest-and-coverage"
+		"test-and-coverage": "pnpm jest-and-coverage",
+		"generate-api-json": "node ./generate_api_json.js"
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
@@ -58,27 +61,27 @@
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.412.0",
 		"@aws-sdk/lib-storage": "3.412.0",
-		"@smithy/node-http-handler": "2.1.5",
-		"@bull-board/api": "5.9.1",
-		"@bull-board/fastify": "5.9.1",
-		"@bull-board/ui": "5.9.1",
+		"@bull-board/api": "5.10.2",
+		"@bull-board/fastify": "5.10.2",
+		"@bull-board/ui": "5.10.2",
 		"@discordapp/twemoji": "14.1.2",
-		"@fastify/accepts": "4.2.0",
-		"@fastify/cookie": "9.1.0",
-		"@fastify/cors": "8.4.0",
+		"@fastify/accepts": "4.3.0",
+		"@fastify/cookie": "9.2.0",
+		"@fastify/cors": "8.4.2",
 		"@fastify/express": "2.3.0",
-		"@fastify/http-proxy": "9.2.1",
+		"@fastify/http-proxy": "9.3.0",
 		"@fastify/multipart": "8.0.0",
-		"@fastify/static": "6.11.2",
+		"@fastify/static": "6.12.0",
 		"@fastify/view": "8.2.0",
-		"@nestjs/common": "10.2.7",
-		"@nestjs/core": "10.2.7",
-		"@nestjs/testing": "10.2.7",
+		"@nestjs/common": "10.2.10",
+		"@nestjs/core": "10.2.10",
+		"@nestjs/testing": "10.2.10",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "8.3.2",
-		"@sinonjs/fake-timers": "11.1.0",
-		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.93",
+		"@simplewebauthn/server": "8.3.5",
+		"@sinonjs/fake-timers": "11.2.2",
+		"@smithy/node-http-handler": "2.1.10",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "1.3.100",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
@@ -86,7 +89,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.12.4",
+		"bullmq": "4.15.3",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -97,9 +100,10 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.24.2",
+		"fastify": "4.25.0",
+		"fastify-raw-body": "4.3.0",
 		"feed": "4.2.2",
-		"file-type": "18.5.0",
+		"file-type": "18.7.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "4.0.0",
 		"got": "13.0.0",
@@ -111,113 +115,114 @@
 		"ipaddr.js": "2.1.0",
 		"is-svg": "5.0.0",
 		"js-yaml": "4.1.0",
-		"jsdom": "22.1.0",
+		"jsdom": "23.0.1",
 		"json5": "2.2.3",
-		"jsonld": "8.3.1",
-		"jsrsasign": "10.8.6",
-		"meilisearch": "0.35.0",
+		"jsonld": "8.3.2",
+		"jsrsasign": "10.9.0",
+		"meilisearch": "0.36.0",
 		"mfm-js": "0.23.3",
 		"microformats-parser": "1.5.2",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"ms": "3.0.0-canary.1",
-		"nanoid": "5.0.2",
+		"nanoid": "5.0.4",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.6",
+		"nodemailer": "6.9.7",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.12.0",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
-		"otpauth": "9.1.5",
+		"otpauth": "9.2.1",
 		"parse5": "7.1.2",
 		"pg": "8.11.3",
 		"pkce-challenge": "4.0.1",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
-		"punycode": "2.3.0",
+		"punycode": "2.3.1",
 		"pureimage": "0.3.17",
 		"qrcode": "1.5.3",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.20.3",
+		"re2": "1.20.9",
 		"redis-lock": "0.1.4",
-		"reflect-metadata": "0.1.13",
+		"reflect-metadata": "0.2.0",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
 		"sanitize-html": "2.11.0",
+		"secure-json-parse": "2.7.0",
 		"sharp": "0.32.6",
 		"sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.21.12",
+		"systeminformation": "5.21.20",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.17",
-		"typescript": "5.2.2",
+		"typescript": "5.3.3",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.6",
-		"ws": "8.14.2",
+		"ws": "8.15.1",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@simplewebauthn/typescript-types": "8.0.0",
+		"@simplewebauthn/typescript-types": "8.3.4",
 		"@swc/jest": "0.2.29",
-		"@types/accepts": "1.3.6",
-		"@types/archiver": "5.3.4",
-		"@types/bcryptjs": "2.4.5",
-		"@types/body-parser": "1.19.4",
+		"@types/accepts": "1.3.7",
+		"@types/archiver": "6.0.2",
+		"@types/bcryptjs": "2.4.6",
+		"@types/body-parser": "1.19.5",
 		"@types/cbor": "6.0.0",
-		"@types/color-convert": "2.0.2",
-		"@types/content-disposition": "0.5.7",
-		"@types/fluent-ffmpeg": "2.1.22",
-		"@types/http-link-header": "1.0.3",
-		"@types/jest": "29.5.5",
-		"@types/js-yaml": "4.0.7",
-		"@types/jsdom": "21.1.3",
-		"@types/jsonld": "1.5.10",
-		"@types/jsrsasign": "10.5.9",
-		"@types/mime-types": "2.1.2",
-		"@types/ms": "0.7.32",
-		"@types/node": "20.8.6",
+		"@types/color-convert": "2.0.3",
+		"@types/content-disposition": "0.5.8",
+		"@types/fluent-ffmpeg": "2.1.24",
+		"@types/http-link-header": "1.0.5",
+		"@types/jest": "29.5.11",
+		"@types/js-yaml": "4.0.9",
+		"@types/jsdom": "21.1.6",
+		"@types/jsonld": "1.5.13",
+		"@types/jsrsasign": "10.5.12",
+		"@types/mime-types": "2.1.4",
+		"@types/ms": "0.7.34",
+		"@types/node": "20.10.4",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.11",
-		"@types/oauth": "0.9.2",
-		"@types/oauth2orize": "1.11.1",
-		"@types/oauth2orize-pkce": "0.1.0",
-		"@types/pg": "8.10.5",
-		"@types/pug": "2.0.7",
-		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.5.2",
-		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "3.4.4",
-		"@types/rename": "1.0.5",
-		"@types/sanitize-html": "2.9.2",
-		"@types/semver": "7.5.3",
+		"@types/nodemailer": "6.4.14",
+		"@types/oauth": "0.9.4",
+		"@types/oauth2orize": "1.11.3",
+		"@types/oauth2orize-pkce": "0.1.2",
+		"@types/pg": "8.10.9",
+		"@types/pug": "2.0.10",
+		"@types/punycode": "2.1.3",
+		"@types/qrcode": "1.5.5",
+		"@types/random-seed": "0.3.5",
+		"@types/ratelimiter": "3.4.6",
+		"@types/rename": "1.0.7",
+		"@types/sanitize-html": "2.9.5",
+		"@types/semver": "7.5.6",
 		"@types/sharp": "0.32.0",
-		"@types/simple-oauth2": "5.0.5",
-		"@types/sinonjs__fake-timers": "8.1.3",
-		"@types/tinycolor2": "1.4.4",
-		"@types/tmp": "0.2.4",
-		"@types/vary": "1.1.1",
-		"@types/web-push": "3.6.1",
-		"@types/ws": "8.5.7",
-		"@typescript-eslint/eslint-plugin": "6.8.0",
-		"@typescript-eslint/parser": "6.8.0",
+		"@types/simple-oauth2": "5.0.7",
+		"@types/sinonjs__fake-timers": "8.1.5",
+		"@types/tinycolor2": "1.4.6",
+		"@types/tmp": "0.2.6",
+		"@types/vary": "1.1.3",
+		"@types/web-push": "3.6.3",
+		"@types/ws": "8.5.10",
+		"@typescript-eslint/eslint-plugin": "6.14.0",
+		"@typescript-eslint/parser": "6.14.0",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.51.0",
-		"eslint-plugin-import": "2.28.1",
+		"eslint": "8.55.0",
+		"eslint-plugin-import": "2.29.0",
 		"execa": "8.0.1",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",

packages/backend/src/config.ts

@@ -258,7 +258,7 @@ export function loadConfig(): Config {
 		clientEntry: clientManifest['src/_boot_.ts'],
 		clientManifestExists: clientManifestExists,
 		perChannelMaxNoteCacheCount: config.perChannelMaxNoteCacheCount ?? 1000,
-		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 300,
+		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 500,
 		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
 		pidFile: config.pidFile,
 	};

packages/backend/src/core/AchievementService.ts

@@ -86,6 +86,7 @@ export const ACHIEVEMENT_TYPES = [
 	'cookieClicked',
 	'brainDiver',
 	'smashTestNotificationButton',
+	'tutorialCompleted',
 ] as const;
 
 @Injectable()

packages/backend/src/core/AnnouncementService.ts

@@ -47,6 +47,7 @@ export class AnnouncementService {
 
 		const q = this.announcementsRepository.createQueryBuilder('announcement')
 			.where('announcement.isActive = true')
+			.andWhere('announcement.silence = false')
 			.andWhere(new Brackets(qb => {
 				qb.orWhere('announcement.userId = :userId', { userId: user.id });
 				qb.orWhere('announcement.userId IS NULL');
@@ -73,6 +74,7 @@ export class AnnouncementService {
 			icon: values.icon,
 			display: values.display,
 			forExistingUsers: values.forExistingUsers,
+			silence: values.silence,
 			needConfirmationToRead: values.needConfirmationToRead,
 			userId: values.userId,
 		}).then(x => this.announcementsRepository.findOneByOrFail(x.identifiers[0]));
@@ -124,6 +126,7 @@ export class AnnouncementService {
 			display: values.display,
 			icon: values.icon,
 			forExistingUsers: values.forExistingUsers,
+			silence: values.silence,
 			needConfirmationToRead: values.needConfirmationToRead,
 			isActive: values.isActive,
 		});
@@ -210,6 +213,7 @@ export class AnnouncementService {
 			icon: announcement.icon,
 			display: announcement.display,
 			needConfirmationToRead: announcement.needConfirmationToRead,
+			silence: announcement.silence,
 			forYou: announcement.userId === me?.id,
 			isRead: reads.some(read => read.announcementId === announcement.id),
 		}));

packages/backend/src/core/AntennaService.ts

@@ -16,7 +16,7 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -39,7 +39,7 @@ export class AntennaService implements OnApplicationShutdown {
 
 		private utilityService: UtilityService,
 		private globalEventService: GlobalEventService,
-		private funoutTimelineService: FunoutTimelineService,
+		private fanoutTimelineService: FanoutTimelineService,
 	) {
 		this.antennasFetched = false;
 		this.antennas = [];
@@ -60,11 +60,21 @@ export class AntennaService implements OnApplicationShutdown {
 						lastUsedAt: new Date(body.lastUsedAt),
 					});
 					break;
-				case 'antennaUpdated':
-					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
-						...body,
-						lastUsedAt: new Date(body.lastUsedAt),
-					};
+				case 'antennaUpdated': {
+					const idx = this.antennas.findIndex(a => a.id === body.id);
+					if (idx >= 0) {
+						this.antennas[idx] = {
+							...body,
+							lastUsedAt: new Date(body.lastUsedAt),
+						};
+					} else {
+						// サーバ起動時にactiveじゃなかった場合、リストに持っていないので追加する必要あり
+						this.antennas.push({
+							...body,
+							lastUsedAt: new Date(body.lastUsedAt),
+						});
+					}
+				}
 					break;
 				case 'antennaDeleted':
 					this.antennas = this.antennas.filter(a => a.id !== body.id);
@@ -84,7 +94,7 @@ export class AntennaService implements OnApplicationShutdown {
 		const redisPipeline = this.redisForTimelines.pipeline();
 
 		for (const antenna of matchedAntennas) {
-			this.funoutTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
+			this.fanoutTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
 			this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 		}
 

packages/backend/src/core/AvatarDecorationService.ts

@@ -0,0 +1,129 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
+import * as Redis from 'ioredis';
+import type { AvatarDecorationsRepository, MiAvatarDecoration, MiUser } from '@/models/_.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { MemorySingleCache } from '@/misc/cache.js';
+import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+
+@Injectable()
+export class AvatarDecorationService implements OnApplicationShutdown {
+	public cache: MemorySingleCache<MiAvatarDecoration[]>;
+
+	constructor(
+		@Inject(DI.redisForSub)
+		private redisForSub: Redis.Redis,
+
+		@Inject(DI.avatarDecorationsRepository)
+		private avatarDecorationsRepository: AvatarDecorationsRepository,
+
+		private idService: IdService,
+		private moderationLogService: ModerationLogService,
+		private globalEventService: GlobalEventService,
+	) {
+		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30);
+
+		this.redisForSub.on('message', this.onMessage);
+	}
+
+	@bindThis
+	private async onMessage(_: string, data: string): Promise<void> {
+		const obj = JSON.parse(data);
+
+		if (obj.channel === 'internal') {
+			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			switch (type) {
+				case 'avatarDecorationCreated':
+				case 'avatarDecorationUpdated':
+				case 'avatarDecorationDeleted': {
+					this.cache.delete();
+					break;
+				}
+				default:
+					break;
+			}
+		}
+	}
+
+	@bindThis
+	public async create(options: Partial<MiAvatarDecoration>, moderator?: MiUser): Promise<MiAvatarDecoration> {
+		const created = await this.avatarDecorationsRepository.insert({
+			id: this.idService.gen(),
+			...options,
+		}).then(x => this.avatarDecorationsRepository.findOneByOrFail(x.identifiers[0]));
+
+		this.globalEventService.publishInternalEvent('avatarDecorationCreated', created);
+
+		if (moderator) {
+			this.moderationLogService.log(moderator, 'createAvatarDecoration', {
+				avatarDecorationId: created.id,
+				avatarDecoration: created,
+			});
+		}
+
+		return created;
+	}
+
+	@bindThis
+	public async update(id: MiAvatarDecoration['id'], params: Partial<MiAvatarDecoration>, moderator?: MiUser): Promise<void> {
+		const avatarDecoration = await this.avatarDecorationsRepository.findOneByOrFail({ id });
+
+		const date = new Date();
+		await this.avatarDecorationsRepository.update(avatarDecoration.id, {
+			updatedAt: date,
+			...params,
+		});
+
+		const updated = await this.avatarDecorationsRepository.findOneByOrFail({ id: avatarDecoration.id });
+		this.globalEventService.publishInternalEvent('avatarDecorationUpdated', updated);
+
+		if (moderator) {
+			this.moderationLogService.log(moderator, 'updateAvatarDecoration', {
+				avatarDecorationId: avatarDecoration.id,
+				before: avatarDecoration,
+				after: updated,
+			});
+		}
+	}
+
+	@bindThis
+	public async delete(id: MiAvatarDecoration['id'], moderator?: MiUser): Promise<void> {
+		const avatarDecoration = await this.avatarDecorationsRepository.findOneByOrFail({ id });
+
+		await this.avatarDecorationsRepository.delete({ id: avatarDecoration.id });
+		this.globalEventService.publishInternalEvent('avatarDecorationDeleted', avatarDecoration);
+
+		if (moderator) {
+			this.moderationLogService.log(moderator, 'deleteAvatarDecoration', {
+				avatarDecorationId: avatarDecoration.id,
+				avatarDecoration: avatarDecoration,
+			});
+		}
+	}
+
+	@bindThis
+	public async getAll(noCache = false): Promise<MiAvatarDecoration[]> {
+		if (noCache) {
+			this.cache.delete();
+		}
+		return this.cache.fetch(() => this.avatarDecorationsRepository.find());
+	}
+
+	@bindThis
+	public dispose(): void {
+		this.redisForSub.off('message', this.onMessage);
+	}
+
+	@bindThis
+	public onApplicationShutdown(signal?: string | undefined): void {
+		this.dispose();
+	}
+}

packages/backend/src/core/CacheService.ts

@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js';
+import type { BlockingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js';
 import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
 import type { MiLocalUser, MiUser } from '@/models/User.js';
 import { DI } from '@/di-symbols.js';
@@ -26,7 +26,6 @@ export class CacheService implements OnApplicationShutdown {
 	public userBlockedCache: RedisKVCache<Set<string>>; // NOTE: 「被」Blockキャッシュ
 	public renoteMutingsCache: RedisKVCache<Set<string>>;
 	public userFollowingsCache: RedisKVCache<Record<string, Pick<MiFollowing, 'withReplies'> | undefined>>;
-	public userFollowingChannelsCache: RedisKVCache<Set<string>>;
 
 	constructor(
 		@Inject(DI.redis)
@@ -53,9 +52,6 @@ export class CacheService implements OnApplicationShutdown {
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
-		@Inject(DI.channelFollowingsRepository)
-		private channelFollowingsRepository: ChannelFollowingsRepository,
-
 		private userEntityService: UserEntityService,
 	) {
 		//this.onMessage = this.onMessage.bind(this);
@@ -150,13 +146,7 @@ export class CacheService implements OnApplicationShutdown {
 			fromRedisConverter: (value) => JSON.parse(value),
 		});
 
-		this.userFollowingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowingChannels', {
-			lifetime: 1000 * 60 * 30, // 30m
-			memoryCacheLifetime: 1000 * 60, // 1m
-			fetcher: (key) => this.channelFollowingsRepository.find({ where: { followerId: key }, select: ['followeeId'] }).then(xs => new Set(xs.map(x => x.followeeId))),
-			toRedisConverter: (value) => JSON.stringify(Array.from(value)),
-			fromRedisConverter: (value) => new Set(JSON.parse(value)),
-		});
+		// NOTE: チャンネルのフォロー状況キャッシュはChannelFollowingServiceで行っている
 
 		this.redisForSub.on('message', this.onMessage);
 	}
@@ -221,7 +211,6 @@ export class CacheService implements OnApplicationShutdown {
 		this.userBlockedCache.dispose();
 		this.renoteMutingsCache.dispose();
 		this.userFollowingsCache.dispose();
-		this.userFollowingChannelsCache.dispose();
 	}
 
 	@bindThis

packages/backend/src/core/ChannelFollowingService.ts

@@ -0,0 +1,104 @@
+import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import Redis from 'ioredis';
+import { DI } from '@/di-symbols.js';
+import type { ChannelFollowingsRepository } from '@/models/_.js';
+import { MiChannel } from '@/models/_.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
+import { bindThis } from '@/decorators.js';
+import type { MiLocalUser } from '@/models/User.js';
+import { RedisKVCache } from '@/misc/cache.js';
+
+@Injectable()
+export class ChannelFollowingService implements OnModuleInit {
+	public userFollowingChannelsCache: RedisKVCache<Set<string>>;
+
+	constructor(
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
+		@Inject(DI.redisForSub)
+		private redisForSub: Redis.Redis,
+		@Inject(DI.channelFollowingsRepository)
+		private channelFollowingsRepository: ChannelFollowingsRepository,
+		private idService: IdService,
+		private globalEventService: GlobalEventService,
+	) {
+		this.userFollowingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowingChannels', {
+			lifetime: 1000 * 60 * 30, // 30m
+			memoryCacheLifetime: 1000 * 60, // 1m
+			fetcher: (key) => this.channelFollowingsRepository.find({
+				where: { followerId: key },
+				select: ['followeeId'],
+			}).then(xs => new Set(xs.map(x => x.followeeId))),
+			toRedisConverter: (value) => JSON.stringify(Array.from(value)),
+			fromRedisConverter: (value) => new Set(JSON.parse(value)),
+		});
+
+		this.redisForSub.on('message', this.onMessage);
+	}
+
+	onModuleInit() {
+	}
+
+	@bindThis
+	public async follow(
+		requestUser: MiLocalUser,
+		targetChannel: MiChannel,
+	): Promise<void> {
+		await this.channelFollowingsRepository.insert({
+			id: this.idService.gen(),
+			followerId: requestUser.id,
+			followeeId: targetChannel.id,
+		});
+
+		this.globalEventService.publishInternalEvent('followChannel', {
+			userId: requestUser.id,
+			channelId: targetChannel.id,
+		});
+	}
+
+	@bindThis
+	public async unfollow(
+		requestUser: MiLocalUser,
+		targetChannel: MiChannel,
+	): Promise<void> {
+		await this.channelFollowingsRepository.delete({
+			followerId: requestUser.id,
+			followeeId: targetChannel.id,
+		});
+
+		this.globalEventService.publishInternalEvent('unfollowChannel', {
+			userId: requestUser.id,
+			channelId: targetChannel.id,
+		});
+	}
+
+	@bindThis
+	private async onMessage(_: string, data: string): Promise<void> {
+		const obj = JSON.parse(data);
+
+		if (obj.channel === 'internal') {
+			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			switch (type) {
+				case 'followChannel': {
+					this.userFollowingChannelsCache.refresh(body.userId);
+					break;
+				}
+				case 'unfollowChannel': {
+					this.userFollowingChannelsCache.delete(body.userId);
+					break;
+				}
+			}
+		}
+	}
+
+	@bindThis
+	public dispose(): void {
+		this.userFollowingChannelsCache.dispose();
+	}
+
+	@bindThis
+	public onApplicationShutdown(signal?: string | undefined): void {
+		this.dispose();
+	}
+}

packages/backend/src/core/CoreModule.ts

@@ -4,6 +4,7 @@
  */
 
 import { Module } from '@nestjs/common';
+import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
 import { AccountMoveService } from './AccountMoveService.js';
 import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
@@ -11,6 +12,7 @@ import { AnnouncementService } from './AnnouncementService.js';
 import { AntennaService } from './AntennaService.js';
 import { AppLockService } from './AppLockService.js';
 import { AchievementService } from './AchievementService.js';
+import { AvatarDecorationService } from './AvatarDecorationService.js';
 import { CaptchaService } from './CaptchaService.js';
 import { CreateSystemUserService } from './CreateSystemUserService.js';
 import { CustomEmojiService } from './CustomEmojiService.js';
@@ -61,7 +63,9 @@ import { FileInfoService } from './FileInfoService.js';
 import { SearchService } from './SearchService.js';
 import { ClipService } from './ClipService.js';
 import { FeaturedService } from './FeaturedService.js';
-import { FunoutTimelineService } from './FunoutTimelineService.js';
+import { FanoutTimelineService } from './FanoutTimelineService.js';
+import { ChannelFollowingService } from './ChannelFollowingService.js';
+import { RegistryApiService } from './RegistryApiService.js';
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
 import NotesChart from './chart/charts/notes.js';
@@ -140,6 +144,7 @@ const $AnnouncementService: Provider = { provide: 'AnnouncementService', useExis
 const $AntennaService: Provider = { provide: 'AntennaService', useExisting: AntennaService };
 const $AppLockService: Provider = { provide: 'AppLockService', useExisting: AppLockService };
 const $AchievementService: Provider = { provide: 'AchievementService', useExisting: AchievementService };
+const $AvatarDecorationService: Provider = { provide: 'AvatarDecorationService', useExisting: AvatarDecorationService };
 const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: CaptchaService };
 const $CreateSystemUserService: Provider = { provide: 'CreateSystemUserService', useExisting: CreateSystemUserService };
 const $CustomEmojiService: Provider = { provide: 'CustomEmojiService', useExisting: CustomEmojiService };
@@ -190,7 +195,10 @@ const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: Fi
 const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
 const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
 const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
-const $FunoutTimelineService: Provider = { provide: 'FunoutTimelineService', useExisting: FunoutTimelineService };
+const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', useExisting: FanoutTimelineService };
+const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
+const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
+const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -273,6 +281,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AntennaService,
 		AppLockService,
 		AchievementService,
+		AvatarDecorationService,
 		CaptchaService,
 		CreateSystemUserService,
 		CustomEmojiService,
@@ -323,7 +332,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		SearchService,
 		ClipService,
 		FeaturedService,
-		FunoutTimelineService,
+		FanoutTimelineService,
+		FanoutTimelineEndpointService,
+		ChannelFollowingService,
+		RegistryApiService,
 		ChartLoggerService,
 		FederationChart,
 		NotesChart,
@@ -399,6 +411,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AntennaService,
 		$AppLockService,
 		$AchievementService,
+		$AvatarDecorationService,
 		$CaptchaService,
 		$CreateSystemUserService,
 		$CustomEmojiService,
@@ -449,7 +462,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$SearchService,
 		$ClipService,
 		$FeaturedService,
-		$FunoutTimelineService,
+		$FanoutTimelineService,
+		$FanoutTimelineEndpointService,
+		$ChannelFollowingService,
+		$RegistryApiService,
 		$ChartLoggerService,
 		$FederationChart,
 		$NotesChart,
@@ -526,6 +542,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AntennaService,
 		AppLockService,
 		AchievementService,
+		AvatarDecorationService,
 		CaptchaService,
 		CreateSystemUserService,
 		CustomEmojiService,
@@ -576,7 +593,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		SearchService,
 		ClipService,
 		FeaturedService,
-		FunoutTimelineService,
+		FanoutTimelineService,
+		FanoutTimelineEndpointService,
+		ChannelFollowingService,
+		RegistryApiService,
 		FederationChart,
 		NotesChart,
 		UsersChart,
@@ -651,6 +671,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AntennaService,
 		$AppLockService,
 		$AchievementService,
+		$AvatarDecorationService,
 		$CaptchaService,
 		$CreateSystemUserService,
 		$CustomEmojiService,
@@ -701,7 +722,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$SearchService,
 		$ClipService,
 		$FeaturedService,
-		$FunoutTimelineService,
+		$FanoutTimelineService,
+		$FanoutTimelineEndpointService,
+		$ChannelFollowingService,
+		$RegistryApiService,
 		$FederationChart,
 		$NotesChart,
 		$UsersChart,

packages/backend/src/core/EmailService.ts

@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { URLSearchParams } from 'node:url';
 import * as nodemailer from 'nodemailer';
 import { Inject, Injectable } from '@nestjs/common';
 import { validate as validateEmail } from 'deep-email-validator';
+import { SubOutputFormat } from 'deep-email-validator/dist/output/output.js';
 import { MetaService } from '@/core/MetaService.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
@@ -13,6 +15,7 @@ import type Logger from '@/logger.js';
 import type { UserProfilesRepository } from '@/models/_.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
 
 @Injectable()
 export class EmailService {
@@ -27,6 +30,7 @@ export class EmailService {
 
 		private metaService: MetaService,
 		private loggerService: LoggerService,
+		private httpRequestService: HttpRequestService,
 	) {
 		this.logger = this.loggerService.getLogger('email');
 	}
@@ -160,14 +164,25 @@ export class EmailService {
 			email: emailAddress,
 		});
 
-		const validated = meta.enableActiveEmailValidation ? await validateEmail({
-			email: emailAddress,
-			validateRegex: true,
-			validateMx: true,
-			validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
-			validateDisposable: true, // 捨てアドかどうかチェック
-			validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
-		}) : { valid: true, reason: null };
+		const verifymailApi = meta.enableVerifymailApi && meta.verifymailAuthKey != null;
+		let validated;
+
+		if (meta.enableActiveEmailValidation && meta.verifymailAuthKey) {
+			if (verifymailApi) {
+				validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey);
+			} else {
+				validated = meta.enableActiveEmailValidation ? await validateEmail({
+					email: emailAddress,
+					validateRegex: true,
+					validateMx: true,
+					validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
+					validateDisposable: true, // 捨てアドかどうかチェック
+					validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
+				}) : { valid: true, reason: null };
+			}
+		} else {
+			validated = { valid: true, reason: null };
+		}
 
 		const available = exist === 0 && validated.valid;
 
@@ -182,4 +197,65 @@ export class EmailService {
 			null,
 		};
 	}
+
+	private async verifyMail(emailAddress: string, verifymailAuthKey: string): Promise<{
+		valid: boolean;
+		reason: 'used' | 'format' | 'disposable' | 'mx' | 'smtp' | null;
+	}> {
+		const endpoint = 'https://verifymail.io/api/' + emailAddress + '?key=' + verifymailAuthKey;
+		const res = await this.httpRequestService.send(endpoint, {
+			method: 'GET',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json, */*',
+			},
+		});
+
+		const json = (await res.json()) as {
+			block: boolean;
+			catch_all: boolean;
+			deliverable_email: boolean;
+			disposable: boolean;
+			domain: string;
+			email_address: string;
+			email_provider: string;
+			mx: boolean;
+			mx_fallback: boolean;
+			mx_host: string[];
+			mx_ip: string[];
+			mx_priority: { [key: string]: number };
+			privacy: boolean;
+			related_domains: string[];
+		};
+
+		if (json.email_address === undefined) {
+			return {
+				valid: false,
+				reason: 'format',
+			};
+		}
+		if (json.deliverable_email !== undefined && !json.deliverable_email) {
+			return {
+				valid: false,
+				reason: 'smtp',
+			};
+		}
+		if (json.disposable) {
+			return {
+				valid: false,
+				reason: 'disposable',
+			};
+		}
+		if (json.mx !== undefined && !json.mx) {
+			return {
+				valid: false,
+				reason: 'mx',
+			};
+		}
+
+		return {
+			valid: true,
+			reason: null,
+		};
+	}
 }

packages/backend/src/core/FanoutTimelineEndpointService.ts

@@ -0,0 +1,186 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import type { MiUser } from '@/models/User.js';
+import type { MiNote } from '@/models/Note.js';
+import { Packed } from '@/misc/json-schema.js';
+import type { NotesRepository } from '@/models/_.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { FanoutTimelineName, FanoutTimelineService } from '@/core/FanoutTimelineService.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
+import { isPureRenote } from '@/misc/is-pure-renote.js';
+import { CacheService } from '@/core/CacheService.js';
+import { isReply } from '@/misc/is-reply.js';
+import { isInstanceMuted } from '@/misc/is-instance-muted.js';
+
+type TimelineOptions = {
+	untilId: string | null,
+	sinceId: string | null,
+	limit: number,
+	allowPartial: boolean,
+	me?: { id: MiUser['id'] } | undefined | null,
+	useDbFallback: boolean,
+	redisTimelines: FanoutTimelineName[],
+	noteFilter?: (note: MiNote) => boolean,
+	alwaysIncludeMyNotes?: boolean;
+	ignoreAuthorFromBlock?: boolean;
+	ignoreAuthorFromMute?: boolean;
+	excludeNoFiles?: boolean;
+	excludeReplies?: boolean;
+	excludePureRenotes: boolean;
+	dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
+};
+
+@Injectable()
+export class FanoutTimelineEndpointService {
+	constructor(
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
+		private noteEntityService: NoteEntityService,
+		private cacheService: CacheService,
+		private fanoutTimelineService: FanoutTimelineService,
+	) {
+	}
+
+	@bindThis
+	async timeline(ps: TimelineOptions): Promise<Packed<'Note'>[]> {
+		return await this.noteEntityService.packMany(await this.getMiNotes(ps), ps.me);
+	}
+
+	@bindThis
+	private async getMiNotes(ps: TimelineOptions): Promise<MiNote[]> {
+		let noteIds: string[];
+		let shouldFallbackToDb = false;
+
+		// 呼び出し元と以下の処理をシンプルにするためにdbFallbackを置き換える
+		if (!ps.useDbFallback) ps.dbFallback = () => Promise.resolve([]);
+
+		const shouldPrepend = ps.sinceId && !ps.untilId;
+		const idCompare: (a: string, b: string) => number = shouldPrepend ? (a, b) => a < b ? -1 : 1 : (a, b) => a > b ? -1 : 1;
+
+		const redisResult = await this.fanoutTimelineService.getMulti(ps.redisTimelines, ps.untilId, ps.sinceId);
+
+		// TODO: いい感じにgetMulti内でソート済だからuniqするときにredisResultが全てソート済なのを利用して再ソートを避けたい
+		const redisResultIds = Array.from(new Set(redisResult.flat(1)));
+
+		redisResultIds.sort(idCompare);
+		noteIds = redisResultIds.slice(0, ps.limit);
+
+		shouldFallbackToDb = shouldFallbackToDb || (noteIds.length === 0);
+
+		if (!shouldFallbackToDb) {
+			let filter = ps.noteFilter ?? (_note => true);
+
+			if (ps.alwaysIncludeMyNotes && ps.me) {
+				const me = ps.me;
+				const parentFilter = filter;
+				filter = (note) => note.userId === me.id || parentFilter(note);
+			}
+
+			if (ps.excludeNoFiles) {
+				const parentFilter = filter;
+				filter = (note) => note.fileIds.length !== 0 && parentFilter(note);
+			}
+
+			if (ps.excludeReplies) {
+				const parentFilter = filter;
+				filter = (note) => !isReply(note, ps.me?.id) && parentFilter(note);
+			}
+
+			if (ps.excludePureRenotes) {
+				const parentFilter = filter;
+				filter = (note) => !isPureRenote(note) && parentFilter(note);
+			}
+
+			if (ps.me) {
+				const me = ps.me;
+				const [
+					userIdsWhoMeMuting,
+					userIdsWhoMeMutingRenotes,
+					userIdsWhoBlockingMe,
+					userMutedInstances,
+				] = await Promise.all([
+					this.cacheService.userMutingsCache.fetch(ps.me.id),
+					this.cacheService.renoteMutingsCache.fetch(ps.me.id),
+					this.cacheService.userBlockedCache.fetch(ps.me.id),
+					this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)),
+				]);
+
+				const parentFilter = filter;
+				filter = (note) => {
+					if (isUserRelated(note, userIdsWhoBlockingMe, ps.ignoreAuthorFromBlock)) return false;
+					if (isUserRelated(note, userIdsWhoMeMuting, ps.ignoreAuthorFromMute)) return false;
+					if (isPureRenote(note) && isUserRelated(note, userIdsWhoMeMutingRenotes, ps.ignoreAuthorFromMute)) return false;
+					if (isInstanceMuted(note, userMutedInstances)) return false;
+
+					return parentFilter(note);
+				};
+			}
+
+			const redisTimeline: MiNote[] = [];
+			let readFromRedis = 0;
+			let lastSuccessfulRate = 1; // rateをキャッシュする？
+
+			while ((redisResultIds.length - readFromRedis) !== 0) {
+				const remainingToRead = ps.limit - redisTimeline.length;
+
+				// DBからの取り直しを減らす初回と同じ割合以上で成功すると仮定するが、クエリの長さを考えて三倍まで
+				const countToGet = Math.ceil(remainingToRead * Math.min(1.1 / lastSuccessfulRate, 3));
+				noteIds = redisResultIds.slice(readFromRedis, readFromRedis + countToGet);
+
+				readFromRedis += noteIds.length;
+
+				const gotFromDb = await this.getAndFilterFromDb(noteIds, filter, idCompare);
+				redisTimeline.push(...gotFromDb);
+				lastSuccessfulRate = gotFromDb.length / noteIds.length;
+
+				if (ps.allowPartial ? redisTimeline.length !== 0 : redisTimeline.length >= ps.limit) {
+					// 十分Redisからとれた
+					const result = redisTimeline.slice(0, ps.limit);
+					if (shouldPrepend) result.reverse();
+					return result;
+				}
+			}
+
+			// まだ足りない分はDBにフォールバック
+			const remainingToRead = ps.limit - redisTimeline.length;
+			let dbUntil: string | null;
+			let dbSince: string | null;
+			if (shouldPrepend) {
+				redisTimeline.reverse();
+				dbUntil = ps.untilId;
+				dbSince = noteIds[noteIds.length - 1];
+			} else {
+				dbUntil = noteIds[noteIds.length - 1];
+				dbSince = ps.sinceId;
+			}
+			const gotFromDb = await ps.dbFallback(dbUntil, dbSince, remainingToRead);
+			return shouldPrepend ? [...gotFromDb, ...redisTimeline] : [...redisTimeline, ...gotFromDb];
+		}
+
+		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[]> {
+		const query = this.notesRepository.createQueryBuilder('note')
+			.where('note.id IN (:...noteIds)', { noteIds: noteIds })
+			.innerJoinAndSelect('note.user', 'user')
+			.leftJoinAndSelect('note.reply', 'reply')
+			.leftJoinAndSelect('note.renote', 'renote')
+			.leftJoinAndSelect('reply.user', 'replyUser')
+			.leftJoinAndSelect('renote.user', 'renoteUser')
+			.leftJoinAndSelect('note.channel', 'channel');
+
+		const notes = (await query.getMany()).filter(noteFilter);
+
+		notes.sort((a, b) => idCompare(a.id, b.id));
+
+		return notes;
+	}
+}

packages/backend/src/core/FanoutTimelineService.ts

@@ -9,8 +9,37 @@ import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
 
+export type FanoutTimelineName =
+	// home timeline
+	| `homeTimeline:${string}`
+	| `homeTimelineWithFiles:${string}` // only notes with files are included
+	// local timeline
+	| `localTimeline` // replies are not included
+	| `localTimelineWithFiles` // only non-reply notes with files are included
+	| `localTimelineWithReplies` // only replies are included
+	| `localTimelineWithReplyTo:${string}` // Only replies to specific local user are included. Parameter is reply user id.
+
+	// antenna
+	| `antennaTimeline:${string}`
+
+	// user timeline
+	| `userTimeline:${string}` // replies are not included
+	| `userTimelineWithFiles:${string}` // only non-reply notes with files are included
+	| `userTimelineWithReplies:${string}` // only replies are included
+	| `userTimelineWithChannel:${string}` // only channel notes are included, replies are included
+
+	// user list timelines
+	| `userListTimeline:${string}`
+	| `userListTimelineWithFiles:${string}` // only notes with files are included
+
+	// channel timelines
+	| `channelTimeline:${string}` // replies are included
+
+	// role timelines
+	| `roleTimeline:${string}` // any notes are included
+
 @Injectable()
-export class FunoutTimelineService {
+export class FanoutTimelineService {
 	constructor(
 		@Inject(DI.redisForTimelines)
 		private redisForTimelines: Redis.Redis,
@@ -20,7 +49,7 @@ export class FunoutTimelineService {
 	}
 
 	@bindThis
-	public push(tl: string, id: string, maxlen: number, pipeline: Redis.ChainableCommander) {
+	public push(tl: FanoutTimelineName, id: string, maxlen: number, pipeline: Redis.ChainableCommander) {
 		// リモートから遅れて届いた(もしくは後から追加された)投稿日時が古い投稿が追加されるとページネーション時に問題を引き起こすため、
 		// 3分以内に投稿されたものでない場合、Redisにある最古のIDより新しい場合のみ追加する
 		if (this.idService.parse(id).date.getTime() > Date.now() - 1000 * 60 * 3) {
@@ -41,7 +70,7 @@ export class FunoutTimelineService {
 	}
 
 	@bindThis
-	public get(name: string, untilId?: string | null, sinceId?: string | null) {
+	public get(name: FanoutTimelineName, untilId?: string | null, sinceId?: string | null) {
 		if (untilId && sinceId) {
 			return this.redisForTimelines.lrange('list:' + name, 0, -1)
 				.then(ids => ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1));
@@ -58,7 +87,7 @@ export class FunoutTimelineService {
 	}
 
 	@bindThis
-	public getMulti(name: string[], untilId?: string | null, sinceId?: string | null): Promise<string[][]> {
+	public getMulti(name: FanoutTimelineName[], untilId?: string | null, sinceId?: string | null): Promise<string[][]> {
 		const pipeline = this.redisForTimelines.pipeline();
 		for (const n of name) {
 			pipeline.lrange('list:' + n, 0, -1);
@@ -79,7 +108,7 @@ export class FunoutTimelineService {
 	}
 
 	@bindThis
-	public purge(name: string) {
+	public purge(name: FanoutTimelineName) {
 		return this.redisForTimelines.del('list:' + name);
 	}
 }

packages/backend/src/core/FeaturedService.ts

@@ -5,14 +5,17 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { MiNote, MiUser } from '@/models/_.js';
+import type { MiGalleryPost, MiNote, MiUser } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 
 const GLOBAL_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと
+export const GALLERY_POSTS_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと
 const PER_USER_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 7; // 1週間ごと
 const HASHTAG_RANKING_WINDOW = 1000 * 60 * 60; // 1時間ごと
 
+const featuredEpoc = new Date('2023-01-01T00:00:00Z').getTime();
+
 @Injectable()
 export class FeaturedService {
 	constructor(
@@ -23,7 +26,7 @@ export class FeaturedService {
 
 	@bindThis
 	private getCurrentWindow(windowRange: number): number {
-		const passed = new Date().getTime() - new Date(new Date().getFullYear(), 0, 1).getTime();
+		const passed = new Date().getTime() - featuredEpoc;
 		return Math.floor(passed / windowRange);
 	}
 
@@ -52,7 +55,7 @@ export class FeaturedService {
 			`${name}:${currentWindow}`, 0, threshold, 'REV', 'WITHSCORES');
 		redisPipeline.zrange(
 			`${name}:${previousWindow}`, 0, threshold, 'REV', 'WITHSCORES');
-		const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => r[1] as string[]) : [[], []]);
+		const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => (r[1] ?? []) as string[]) : [[], []]);
 
 		const ranking = new Map<string, number>();
 		for (let i = 0; i < currentRankingResult.length; i += 2) {
@@ -79,6 +82,11 @@ export class FeaturedService {
 		return this.updateRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
 	}
 
+	@bindThis
+	public updateGalleryPostsRanking(galleryPostId: MiGalleryPost['id'], score = 1): Promise<void> {
+		return this.updateRankingOf('featuredGalleryPostsRanking', GALLERY_POSTS_RANKING_WINDOW, galleryPostId, score);
+	}
+
 	@bindThis
 	public updateInChannelNotesRanking(channelId: MiNote['channelId'], noteId: MiNote['id'], score = 1): Promise<void> {
 		return this.updateRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
@@ -99,6 +107,11 @@ export class FeaturedService {
 		return this.getRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, threshold);
 	}
 
+	@bindThis
+	public getGalleryPostsRanking(threshold: number): Promise<MiGalleryPost['id'][]> {
+		return this.getRankingOf('featuredGalleryPostsRanking', GALLERY_POSTS_RANKING_WINDOW, threshold);
+	}
+
 	@bindThis
 	public getInChannelNotesRanking(channelId: MiNote['channelId'], threshold: number): Promise<MiNote['id'][]> {
 		return this.getRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, threshold);

packages/backend/src/core/GlobalEventService.ts

@@ -18,7 +18,7 @@ import type { MiSignin } from '@/models/Signin.js';
 import type { MiPage } from '@/models/Page.js';
 import type { MiWebhook } from '@/models/Webhook.js';
 import type { MiMeta } from '@/models/Meta.js';
-import { MiRole, MiRoleAssignment } from '@/models/_.js';
+import { MiAvatarDecoration, MiRole, MiRoleAssignment } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
@@ -77,7 +77,13 @@ export interface MainEventTypes {
 	unreadAntenna: MiAntenna;
 	readAllAnnouncements: undefined;
 	myTokenRegenerated: undefined;
-	signin: MiSignin;
+	signin: {
+		id: MiSignin['id'];
+		createdAt: string;
+		ip: string;
+		headers: Record<string, any>;
+		success: boolean;
+	};
 	registryUpdated: {
 		scope?: string[];
 		key: string;
@@ -188,6 +194,9 @@ export interface InternalEventTypes {
 	antennaCreated: MiAntenna;
 	antennaDeleted: MiAntenna;
 	antennaUpdated: MiAntenna;
+	avatarDecorationCreated: MiAvatarDecoration;
+	avatarDecorationDeleted: MiAvatarDecoration;
+	avatarDecorationUpdated: MiAvatarDecoration;
 	metaUpdated: MiMeta;
 	followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
 	unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };

packages/backend/src/core/IdService.ts

@@ -7,11 +7,11 @@ import { Inject, Injectable } from '@nestjs/common';
 import { ulid } from 'ulid';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
-import { genAid, parseAid } from '@/misc/id/aid.js';
-import { genAidx, parseAidx } from '@/misc/id/aidx.js';
-import { genMeid, parseMeid } from '@/misc/id/meid.js';
-import { genMeidg, parseMeidg } from '@/misc/id/meidg.js';
-import { genObjectId, parseObjectId } from '@/misc/id/object-id.js';
+import { genAid, isSafeAidT, parseAid } from '@/misc/id/aid.js';
+import { genAidx, isSafeAidxT, parseAidx } from '@/misc/id/aidx.js';
+import { genMeid, isSafeMeidT, parseMeid } from '@/misc/id/meid.js';
+import { genMeidg, isSafeMeidgT, parseMeidg } from '@/misc/id/meidg.js';
+import { genObjectId, isSafeObjectIdT, parseObjectId } from '@/misc/id/object-id.js';
 import { bindThis } from '@/decorators.js';
 import { parseUlid } from '@/misc/id/ulid.js';
 
@@ -26,6 +26,19 @@ export class IdService {
 		this.method = config.id.toLowerCase();
 	}
 
+	@bindThis
+	public isSafeT(t: number): boolean {
+		switch (this.method) {
+			case 'aid': return isSafeAidT(t);
+			case 'aidx': return isSafeAidxT(t);
+			case 'meid': return isSafeMeidT(t);
+			case 'meidg': return isSafeMeidgT(t);
+			case 'ulid': return t > 0;
+			case 'objectid': return isSafeObjectIdT(t);
+			default: throw new Error('unrecognized id generation method');
+		}
+	}
+
 	/**
 	 * 時間を元にIDを生成します(省略時は現在日時)
 	 * @param time 日時

packages/backend/src/core/MfmService.ts

@@ -250,6 +250,12 @@ export class MfmService {
 			}
 		}
 
+		function fnDefault(node: mfm.MfmFn) {
+			const el = doc.createElement('i');
+			appendChildren(node.children, el);
+			return el;
+		}
+
 		const handlers: { [K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any } = {
 			bold: (node) => {
 				const el = doc.createElement('b');
@@ -276,9 +282,69 @@ export class MfmService {
 			},
 
 			fn: (node) => {
-				const el = doc.createElement('i');
-				appendChildren(node.children, el);
-				return el;
+				switch (node.props.name) {
+					case 'unixtime': {
+						const text = node.children[0].type === 'text' ? node.children[0].props.text : '';
+						try {
+							const date = new Date(parseInt(text, 10) * 1000);
+							const el = doc.createElement('time');
+							el.setAttribute('datetime', date.toISOString());
+							el.textContent = date.toISOString();
+							return el;
+						} catch (err) {
+							return fnDefault(node);
+						}
+					}
+
+					case 'ruby': {
+						if (node.children.length === 1) {
+							const child = node.children[0];
+							const text = child.type === 'text' ? child.props.text : '';
+							const rubyEl = doc.createElement('ruby');
+							const rtEl = doc.createElement('rt');
+
+							// ruby未対応のHTMLサニタイザーを通したときにルビが「劉備（りゅうび）」となるようにする
+							const rpStartEl = doc.createElement('rp');
+							rpStartEl.appendChild(doc.createTextNode('('));
+							const rpEndEl = doc.createElement('rp');
+							rpEndEl.appendChild(doc.createTextNode(')'));
+
+							rubyEl.appendChild(doc.createTextNode(text.split(' ')[0]));
+							rtEl.appendChild(doc.createTextNode(text.split(' ')[1]));
+							rubyEl.appendChild(rpStartEl);
+							rubyEl.appendChild(rtEl);
+							rubyEl.appendChild(rpEndEl);
+							return rubyEl;
+						} else {
+							const rt = node.children.at(-1);
+
+							if (!rt) {
+								return fnDefault(node);
+							}
+
+							const text = rt.type === 'text' ? rt.props.text : '';
+							const rubyEl = doc.createElement('ruby');
+							const rtEl = doc.createElement('rt');
+
+							// ruby未対応のHTMLサニタイザーを通したときにルビが「劉備（りゅうび）」となるようにする
+							const rpStartEl = doc.createElement('rp');
+							rpStartEl.appendChild(doc.createTextNode('('));
+							const rpEndEl = doc.createElement('rp');
+							rpEndEl.appendChild(doc.createTextNode(')'));
+
+							appendChildren(node.children.slice(0, node.children.length - 1), rubyEl);
+							rtEl.appendChild(doc.createTextNode(text.trim()));
+							rubyEl.appendChild(rpStartEl);
+							rubyEl.appendChild(rtEl);
+							rubyEl.appendChild(rpEndEl);
+							return rubyEl;
+						}
+					}
+
+					default: {
+						return fnDefault(node);
+					}
+				}
 			},
 
 			blockCode: (node) => {

packages/backend/src/core/NoteCreateService.ts

@@ -54,9 +54,10 @@ import { RoleService } from '@/core/RoleService.js';
 import { MetaService } from '@/core/MetaService.js';
 import { SearchService } from '@/core/SearchService.js';
 import { FeaturedService } from '@/core/FeaturedService.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
-import { nyaize } from '@/misc/nyaize.js';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import { UtilityService } from '@/core/UtilityService.js';
+import { UserBlockingService } from '@/core/UserBlockingService.js';
+import { isReply } from '@/misc/is-reply.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -100,17 +101,14 @@ class NotificationManager {
 	}
 
 	@bindThis
-	public async deliver() {
+	public async notify() {
 		for (const x of this.queue) {
-			// ミュート情報を取得
-			const mentioneeMutes = await this.mutingsRepository.findBy({
-				muterId: x.target,
-			});
-
-			const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId);
-
-			// 通知される側のユーザーが通知する側のユーザーをミュートしていない限りは通知する
-			if (!mentioneesMutedUserIds.includes(this.notifier.id)) {
+			if (x.reason === 'renote') {
+				this.notificationService.createNotification(x.target, 'renote', {
+					noteId: this.note.id,
+					targetNoteId: this.note.renoteId!,
+				}, this.notifier.id);
+			} else {
 				this.notificationService.createNotification(x.target, x.reason, {
 					noteId: this.note.id,
 				}, this.notifier.id);
@@ -197,7 +195,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
 		private queueService: QueueService,
-		private funoutTimelineService: FunoutTimelineService,
+		private fanoutTimelineService: FanoutTimelineService,
 		private noteReadService: NoteReadService,
 		private notificationService: NotificationService,
 		private relayService: RelayService,
@@ -217,6 +215,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private activeUsersChart: ActiveUsersChart,
 		private instanceChart: InstanceChart,
 		private utilityService: UtilityService,
+		private userBlockingService: UserBlockingService,
 	) { }
 
 	@bindThis
@@ -227,8 +226,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		isBot: MiUser['isBot'];
 		isCat: MiUser['isCat'];
 	}, data: Option, silent = false): Promise<MiNote> {
-		let patsedText: mfm.MfmNode[] | null = null;
-
 		// チャンネル外にリプライしたら対象のスコープに合わせる
 		// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
 		if (data.reply && data.channel && data.reply.channelId !== data.channel.id) {
@@ -295,6 +292,18 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 		}
 
+		// Check blocking
+		if (data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length === 0)) {
+			if (data.renote.userHost === null) {
+				if (data.renote.userId !== user.id) {
+					const blocked = await this.userBlockingService.checkBlocked(data.renote.userId, user.id);
+					if (blocked) {
+						throw new Error('blocked');
+					}
+				}
+			}
+		}
+
 		// 返信対象がpublicではないならhomeにする
 		if (data.reply && data.reply.visibility !== 'public' && data.visibility === 'public') {
 			data.visibility = 'home';
@@ -315,25 +324,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 				data.text = data.text.slice(0, DB_MAX_NOTE_TEXT_LENGTH);
 			}
 			data.text = data.text.trim();
-
-			if (user.isCat) {
-				patsedText = mfm.parse(data.text);
-				function nyaizeNode(node: mfm.MfmNode) {
-					if (node.type === 'quote') return;
-					if (node.type === 'text') {
-						node.props.text = nyaize(node.props.text);
-					}
-					if (node.children) {
-						for (const child of node.children) {
-							nyaizeNode(child);
-						}
-					}
-				}
-				for (const node of patsedText) {
-					nyaizeNode(node);
-				}
-				data.text = mfm.toString(patsedText);
-			}
 		} else {
 			data.text = null;
 		}
@@ -344,7 +334,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		// Parse MFM if needed
 		if (!tags || !emojis || !mentionedUsers) {
-			const tokens = patsedText ?? (data.text ? mfm.parse(data.text)! : []);
+			const tokens = (data.text ? mfm.parse(data.text)! : []);
 			const cwTokens = data.cw ? mfm.parse(data.cw)! : [];
 			const choiceTokens = data.poll && data.poll.choices
 				? concat(data.poll.choices.map(choice => mfm.parse(choice)!))
@@ -532,11 +522,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 				followeeId: user.id,
 				notify: 'normal',
 			}).then(followings => {
-				for (const following of followings) {
-					// TODO: ワードミュート考慮
-					this.notificationService.createNotification(following.followerId, 'note', {
-						noteId: note.id,
-					}, user.id);
+				if (note.visibility !== 'specified') {
+					for (const following of followings) {
+						// TODO: ワードミュート考慮
+						this.notificationService.createNotification(following.followerId, 'note', {
+							noteId: note.id,
+						}, user.id);
+					}
 				}
 			});
 		}
@@ -584,7 +576,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 
 			// Pack the note
-			const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true });
+			const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true, withReactionAndUserPairCache: true });
 
 			this.globalEventService.publishNotesStream(noteObj);
 
@@ -650,7 +642,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 				}
 			}
 
-			nm.deliver();
+			nm.notify();
 
 			//#region AP deliver
 			if (this.userEntityService.isLocalUser(user)) {
@@ -847,13 +839,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 	@bindThis
 	private async pushToTl(note: MiNote, user: { id: MiUser['id']; host: MiUser['host']; }) {
 		const meta = await this.metaService.fetch();
+		if (!meta.enableFanoutTimeline) return;
 
 		const r = this.redisForTimelines.pipeline();
 
 		if (note.channelId) {
-			this.funoutTimelineService.push(`channelTimeline:${note.channelId}`, note.id, this.config.perChannelMaxNoteCacheCount, r);
+			this.fanoutTimelineService.push(`channelTimeline:${note.channelId}`, note.id, this.config.perChannelMaxNoteCacheCount, r);
 
-			this.funoutTimelineService.push(`userTimelineWithChannel:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+			this.fanoutTimelineService.push(`userTimelineWithChannel:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 
 			const channelFollowings = await this.channelFollowingsRepository.find({
 				where: {
@@ -863,9 +856,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 
 			for (const channelFollowing of channelFollowings) {
-				this.funoutTimelineService.push(`homeTimeline:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+				this.fanoutTimelineService.push(`homeTimeline:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`homeTimelineWithFiles:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					this.fanoutTimelineService.push(`homeTimelineWithFiles:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
 				}
 			}
 		} else {
@@ -890,7 +883,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 			if (note.visibility === 'followers') {
 				// TODO: 重そうだから何とかしたい Set 使う？
-				userListMemberships = userListMemberships.filter(x => followings.some(f => f.followerId === x.userListUserId));
+				userListMemberships = userListMemberships.filter(x => x.userListUserId === user.id || followings.some(f => f.followerId === x.userListUserId));
 			}
 
 			// TODO: あまりにも数が多いと redisPipeline.exec に失敗する(理由は不明)ため、3万件程度を目安に分割して実行するようにする
@@ -899,13 +892,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 				if (note.visibility === 'specified' && !note.visibleUserIds.some(v => v === following.followerId)) continue;
 
 				// 「自分自身への返信 or そのフォロワーへの返信」のどちらでもない場合
-				if (note.replyId && !(note.replyUserId === note.userId || note.replyUserId === following.followerId)) {
+				if (isReply(note, following.followerId)) {
 					if (!following.withReplies) continue;
 				}
 
-				this.funoutTimelineService.push(`homeTimeline:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+				this.fanoutTimelineService.push(`homeTimeline:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`homeTimelineWithFiles:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					this.fanoutTimelineService.push(`homeTimelineWithFiles:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
 				}
 			}
 
@@ -917,40 +910,43 @@ export class NoteCreateService implements OnApplicationShutdown {
 				) continue;
 
 				// 「自分自身への返信 or そのリストの作成者への返信」のどちらでもない場合
-				if (note.replyId && !(note.replyUserId === note.userId || note.replyUserId === userListMembership.userListUserId)) {
+				if (isReply(note, userListMembership.userListUserId)) {
 					if (!userListMembership.withReplies) continue;
 				}
 
-				this.funoutTimelineService.push(`userListTimeline:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax, r);
+				this.fanoutTimelineService.push(`userListTimeline:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`userListTimelineWithFiles:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax / 2, r);
+					this.fanoutTimelineService.push(`userListTimelineWithFiles:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax / 2, r);
 				}
 			}
 
 			if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) { // 自分自身のHTL
-				this.funoutTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+				this.fanoutTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					this.fanoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
 				}
 			}
 
 			// 自分自身以外への返信
-			if (note.replyId && note.replyUserId !== note.userId) {
-				this.funoutTimelineService.push(`userTimelineWithReplies:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+			if (isReply(note)) {
+				this.fanoutTimelineService.push(`userTimelineWithReplies:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 
 				if (note.visibility === 'public' && note.userHost == null) {
-					this.funoutTimelineService.push('localTimelineWithReplies', note.id, 300, r);
+					this.fanoutTimelineService.push('localTimelineWithReplies', note.id, 300, r);
+					if (note.replyUserHost == null) {
+						this.fanoutTimelineService.push(`localTimelineWithReplyTo:${note.replyUserId}`, note.id, 300 / 10, r);
+					}
 				}
 			} else {
-				this.funoutTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+				this.fanoutTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`userTimelineWithFiles:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax / 2 : meta.perRemoteUserUserTimelineCacheMax / 2, r);
+					this.fanoutTimelineService.push(`userTimelineWithFiles:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax / 2 : meta.perRemoteUserUserTimelineCacheMax / 2, r);
 				}
 
 				if (note.visibility === 'public' && note.userHost == null) {
-					this.funoutTimelineService.push('localTimeline', note.id, 1000, r);
+					this.fanoutTimelineService.push('localTimeline', note.id, 1000, r);
 					if (note.fileIds.length > 0) {
-						this.funoutTimelineService.push('localTimelineWithFiles', note.id, 500, r);
+						this.fanoutTimelineService.push('localTimelineWithFiles', note.id, 500, r);
 					}
 				}
 			}

packages/backend/src/core/NoteDeleteService.ts

@@ -24,6 +24,7 @@ import { bindThis } from '@/decorators.js';
 import { MetaService } from '@/core/MetaService.js';
 import { SearchService } from '@/core/SearchService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { isPureRenote } from '@/misc/is-pure-renote.js';
 
 @Injectable()
 export class NoteDeleteService {
@@ -77,8 +78,8 @@ export class NoteDeleteService {
 			if (this.userEntityService.isLocalUser(user) && !note.localOnly) {
 				let renote: MiNote | null = null;
 
-				// if deletd note is renote
-				if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
+				// if deleted note is renote
+				if (isPureRenote(note)) {
 					renote = await this.notesRepository.findOneBy({
 						id: note.renoteId,
 					});

packages/backend/src/core/NotePiningService.ts

@@ -77,7 +77,7 @@ export class NotePiningService {
 		} as MiUserNotePining);
 
 		// Deliver to remote followers
-		if (this.userEntityService.isLocalUser(user)) {
+		if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
 			this.deliverPinnedChange(user.id, note.id, true);
 		}
 	}
@@ -105,7 +105,7 @@ export class NotePiningService {
 		});
 
 		// Deliver to remote followers
-		if (this.userEntityService.isLocalUser(user)) {
+		if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
 			this.deliverPinnedChange(user.id, noteId, false);
 		}
 	}

packages/backend/src/core/NotificationService.ts

@@ -19,6 +19,7 @@ import { IdService } from '@/core/IdService.js';
 import { CacheService } from '@/core/CacheService.js';
 import type { Config } from '@/config.js';
 import { UserListService } from '@/core/UserListService.js';
+import type { FilterUnionByProperty } from '@/types.js';
 
 @Injectable()
 export class NotificationService implements OnApplicationShutdown {
@@ -73,10 +74,10 @@ export class NotificationService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async createNotification(
+	public async createNotification<T extends MiNotification['type']>(
 		notifieeId: MiUser['id'],
-		type: MiNotification['type'],
-		data: Omit<Partial<MiNotification>, 'notifierId'>,
+		type: T,
+		data: Omit<FilterUnionByProperty<MiNotification, 'type', T>, 'type' | 'id' | 'createdAt' | 'notifierId'>,
 		notifierId?: MiUser['id'] | null,
 	): Promise<MiNotification | null> {
 		const profile = await this.cacheService.userProfileCache.fetch(notifieeId);
@@ -128,9 +129,11 @@ export class NotificationService implements OnApplicationShutdown {
 			id: this.idService.gen(),
 			createdAt: new Date(),
 			type: type,
-			notifierId: notifierId,
+			...(notifierId ? {
+				notifierId,
+			} : {}),
 			...data,
-		} as MiNotification;
+		} as any as FilterUnionByProperty<MiNotification, 'type', T>;
 
 		const redisIdPromise = this.redisClient.xadd(
 			`notificationTimeline:${notifieeId}`,
@@ -144,7 +147,9 @@ export class NotificationService implements OnApplicationShutdown {
 		this.globalEventService.publishMainStream(notifieeId, 'notification', packed);
 
 		// 2秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
-		setTimeout(2000, 'unread notification', { signal: this.#shutdownController.signal }).then(async () => {
+		// テスト通知の場合は即時発行
+		const interval = notification.type === 'test' ? 0 : 2000;
+		setTimeout(interval, 'unread notification', { signal: this.#shutdownController.signal }).then(async () => {
 			const latestReadNotificationId = await this.redisClient.get(`latestReadNotification:${notifieeId}`);
 			if (latestReadNotificationId && (latestReadNotificationId >= (await redisIdPromise)!)) return;
 

packages/backend/src/core/QueryService.ts

@@ -40,7 +40,7 @@ export class QueryService {
 	) {
 	}
 
-	public makePaginationQuery<T extends ObjectLiteral>(q: SelectQueryBuilder<T>, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number): SelectQueryBuilder<T> {
+	public makePaginationQuery<T extends ObjectLiteral>(q: SelectQueryBuilder<T>, sinceId?: string | null, untilId?: string | null, sinceDate?: number | null, untilDate?: number | null): SelectQueryBuilder<T> {
 		if (sinceId && untilId) {
 			q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
 			q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });