Merge pull request #10058 from misskey-dev/develop

Release: 13.7.5

.config/docker_example.yml

@@ -0,0 +1,146 @@
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Misskey configuration
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#   ┌─────┐
+#───┘ URL └─────────────────────────────────────────────────────
+
+# Final accessible URL seen by a user.
+url: https://example.tld/
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# URL SETTINGS AFTER THAT!
+
+#   ┌───────────────────────┐
+#───┘ Port and TLS settings └───────────────────────────────────
+
+#
+# Misskey requires a reverse proxy to support HTTPS connections.
+#
+#                 +----- https://example.tld/ ------------+
+#   +------+      |+-------------+      +----------------+|
+#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   +------+      |+-------------+      +----------------+|
+#                 +---------------------------------------+
+#
+#   You need to set up a reverse proxy. (e.g. nginx)
+#   An encrypted connection with HTTPS is highly recommended
+#   because tokens may be transferred in GET requests.
+
+# The port that your Misskey server should listen on.
+port: 3000
+
+#   ┌──────────────────────────┐
+#───┘ PostgreSQL configuration └────────────────────────────────
+
+db:
+  host: db
+  port: 5432
+
+  # Database name
+  db: misskey
+
+  # Auth
+  user: example-misskey-user
+  pass: example-misskey-pass
+
+  # Whether disable Caching queries
+  #disableCache: true
+
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
+#   ┌─────────────────────┐
+#───┘ Redis configuration └─────────────────────────────────────
+
+redis:
+  host: redis
+  port: 6379
+  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
+
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user:
+#  pass:
+
+#   ┌───────────────┐
+#───┘ ID generation └───────────────────────────────────────────
+
+# You can select the ID generation method.
+# You don't usually need to change this setting, but you can
+# change it according to your preferences.
+
+# Available methods:
+# aid ... Short, Millisecond accuracy
+# meid ... Similar to ObjectID, Millisecond accuracy
+# ulid ... Millisecond accuracy
+# objectid ... This is left for backward compatibility
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# ID SETTINGS AFTER THAT!
+
+id: 'aid'
+
+#   ┌─────────────────────┐
+#───┘ Other configuration └─────────────────────────────────────
+
+# Whether disable HSTS
+#disableHsts: true
+
+# Number of worker processes
+#clusterLimit: 1
+
+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
+# Job rate limiter
+# deliverJobPerSec: 128
+# inboxJobPerSec: 16
+
+# Job attempts
+# deliverJobMaxAttempts: 12
+# inboxJobMaxAttempts: 8
+
+# IP address family used for outgoing request (ipv4, ipv6 or dual)
+#outgoingAddressFamily: ipv4
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+proxyBypassHosts:
+  - api.deepl.com
+  - api-free.deepl.com
+  - www.recaptcha.net
+  - hcaptcha.com
+  - challenges.cloudflare.com
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy
+
+# Proxy remote files (default: false)
+#proxyRemoteFiles: true
+
+# Sign to ActivityPub GET request (default: true)
+signToActivityPubGet: true
+
+#allowedPrivateNetworks: [
+#  '127.0.0.1/32'
+#]
+
+# Upload or download file size limits (bytes)
+#maxFileSize: 262144000

.config/example.yml

@@ -114,11 +114,6 @@ id: 'aid'
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
 
-# Syslog option
-#syslog:
-#  host: localhost
-#  port: 514
-
 # Proxy for HTTP/HTTPS
 #proxy: http://127.0.0.1:3128
 
@@ -135,11 +130,21 @@ proxyBypassHosts:
 #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
 
 # Media Proxy
+# Reference Implementation: https://github.com/misskey-dev/media-proxy
+# * Deliver a common cache between instances
+# * Perform image compression (on a different server resource than the main process)
 #mediaProxy: https://example.com/proxy
 
 # Proxy remote files (default: false)
+# Proxy remote files by this instance or mediaProxy to prevent remote files from running in remote domains.
 #proxyRemoteFiles: true
 
+# Movie Thumbnail Generation URL
+# There is no reference implementation.
+# For example, Misskey will point to the following URL:
+#   https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4
+#videoThumbnailGenerator: https://example.com
+
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true
 

.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM mcr.microsoft.com/devcontainers/javascript-node:0-18

.devcontainer/devcontainer.json

@@ -0,0 +1,11 @@
+{
+	"name": "Misskey",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/workspace",
+	"features": {
+		"ghcr.io/devcontainers-contrib/features/pnpm:2": {}
+	},
+	"forwardPorts": [3000],
+	"postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh"
+}

.devcontainer/devcontainer.yml

@@ -0,0 +1,146 @@
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Misskey configuration
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#   ┌─────┐
+#───┘ URL └─────────────────────────────────────────────────────
+
+# Final accessible URL seen by a user.
+url: http://127.0.0.1:3000/
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# URL SETTINGS AFTER THAT!
+
+#   ┌───────────────────────┐
+#───┘ Port and TLS settings └───────────────────────────────────
+
+#
+# Misskey requires a reverse proxy to support HTTPS connections.
+#
+#                 +----- https://example.tld/ ------------+
+#   +------+      |+-------------+      +----------------+|
+#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   +------+      |+-------------+      +----------------+|
+#                 +---------------------------------------+
+#
+#   You need to set up a reverse proxy. (e.g. nginx)
+#   An encrypted connection with HTTPS is highly recommended
+#   because tokens may be transferred in GET requests.
+
+# The port that your Misskey server should listen on.
+port: 3000
+
+#   ┌──────────────────────────┐
+#───┘ PostgreSQL configuration └────────────────────────────────
+
+db:
+  host: db
+  port: 5432
+
+  # Database name
+  db: misskey
+
+  # Auth
+  user: postgres
+  pass: postgres
+
+  # Whether disable Caching queries
+  #disableCache: true
+
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
+#   ┌─────────────────────┐
+#───┘ Redis configuration └─────────────────────────────────────
+
+redis:
+  host: redis
+  port: 6379
+  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
+
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user:
+#  pass:
+
+#   ┌───────────────┐
+#───┘ ID generation └───────────────────────────────────────────
+
+# You can select the ID generation method.
+# You don't usually need to change this setting, but you can
+# change it according to your preferences.
+
+# Available methods:
+# aid ... Short, Millisecond accuracy
+# meid ... Similar to ObjectID, Millisecond accuracy
+# ulid ... Millisecond accuracy
+# objectid ... This is left for backward compatibility
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# ID SETTINGS AFTER THAT!
+
+id: 'aid'
+
+#   ┌─────────────────────┐
+#───┘ Other configuration └─────────────────────────────────────
+
+# Whether disable HSTS
+#disableHsts: true
+
+# Number of worker processes
+#clusterLimit: 1
+
+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
+# Job rate limiter
+# deliverJobPerSec: 128
+# inboxJobPerSec: 16
+
+# Job attempts
+# deliverJobMaxAttempts: 12
+# inboxJobMaxAttempts: 8
+
+# IP address family used for outgoing request (ipv4, ipv6 or dual)
+#outgoingAddressFamily: ipv4
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+proxyBypassHosts:
+  - api.deepl.com
+  - api-free.deepl.com
+  - www.recaptcha.net
+  - hcaptcha.com
+  - challenges.cloudflare.com
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy
+
+# Proxy remote files (default: false)
+#proxyRemoteFiles: true
+
+# Sign to ActivityPub GET request (default: true)
+signToActivityPubGet: true
+
+allowedPrivateNetworks: [
+  '127.0.0.1/32'
+]
+
+# Upload or download file size limits (bytes)
+#maxFileSize: 262144000

.devcontainer/docker-compose.yml

@@ -0,0 +1,53 @@
+version: '3.8'
+
+services:
+  app:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+
+    volumes:
+      - ../:/workspace:cached
+
+    command: sleep infinity
+
+    networks:
+      - internal_network
+      - external_network
+
+  redis:
+    restart: always
+    image: redis:7-alpine
+    networks:
+      - internal_network
+    volumes:
+      - redis-data:/data
+    healthcheck:
+      test: "redis-cli ping"
+      interval: 5s
+      retries: 20
+
+  db:
+    restart: unless-stopped
+    image: postgres:15-alpine
+    networks:
+      - internal_network
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: misskey
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+      interval: 5s
+      retries: 20
+
+volumes:
+  postgres-data:
+  redis-data:
+
+networks:
+  internal_network:
+    internal: true
+  external_network:

.devcontainer/init.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -xe
+
+sudo chown -R node /workspace
+git submodule update --init
+pnpm install --frozen-lockfile
+cp .devcontainer/devcontainer.yml .config/default.yml
+pnpm build
+pnpm migrate

.dockerignore

@@ -16,9 +16,15 @@ files/
 misskey-assets/
 fluent-emojis/
 .pnp.*
+
+# .yarn関連
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+.idea/
+packages/*/.vscode/
+packages/backend/test/docker-compose.yml

.dockleignore

@@ -0,0 +1,3 @@
+DKL-DI-0005
+DKL-DI-0006
+DKL-LI-0003

.editorconfig

@@ -5,6 +5,7 @@ indent_style = tab
 indent_size = 2
 charset = utf-8
 insert_final_newline = true
+end_of_line = lf
 
 [*.yml]
 indent_style = space

.gitattributes

@@ -5,3 +5,4 @@
 *.glb -diff -text
 *.blend -diff -text
 *.afdesign -diff -text
+* text=auto eol=lf

.github/dependabot.yml

@@ -5,6 +5,11 @@
 
 version: 2
 updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 0
 - package-ecosystem: npm
   directory: "/"
   schedule:
@@ -20,3 +25,8 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 0
+- package-ecosystem: npm
+  directory: "/packages/sw"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 0

.github/workflows/check_copyright_year.yml

@@ -0,0 +1,18 @@
+name: Check copyright year
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  check_copyright_year:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3.2.0
+    - run: |
+        if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
+          echo "Please change copyright year!"
+          exit 1
+        fi

.github/workflows/docker-develop.yml

@@ -10,24 +10,34 @@ jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-
+    if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.3.0
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2.3.0
+        with:
+          platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: misskey/misskey
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
+          platforms: ${{ steps.buildx.outputs.platforms }}
+          provenance: false
           tags: misskey/misskey:develop
           labels: develop
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker.yml

@@ -12,10 +12,15 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.3.0
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2.3.0
+        with:
+          platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: misskey/misskey
           tags: |
@@ -26,14 +31,19 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
+          platforms: ${{ steps.buildx.outputs.platforms }}
+          provenance: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/dockle.yml

@@ -0,0 +1,30 @@
+---
+name: Dockle
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  dockle:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_CONTENT_TRUST: 1
+    steps:
+      - uses: actions/checkout@v3.2.0
+      - run: |
+          curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
+          sudo dpkg -i dockle.deb
+      - run: |
+          cp .config/docker_example.env .config/docker.env
+          cp ./docker-compose.yml.example ./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
+      - run: |
+          cmd="dockle --exit-code 1 misskey-web:latest ${image_name}"
+          echo "> ${cmd}"
+          eval "${cmd}"

.github/workflows/lint.yml

@@ -1,46 +1,79 @@
-name: Lint
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  yarn_install:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: actions/setup-node@v3.2.0
-      with:
-        node-version: 18.x
-        cache: 'yarn'
-    - run: corepack enable
-    - run: yarn install --immutable
-
-  lint:
-    needs: [yarn_install]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        workspace:
-        - backend
-        - frontend
-        - sw
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: actions/setup-node@v3.2.0
-      with:
-        node-version: 18.x
-        cache: 'yarn'
-    - run: corepack enable
-    - run: yarn install --immutable
-    - run: yarn workspace ${{ matrix.workspace }} run lint
+name: Lint
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  pnpm_install:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: pnpm/action-setup@v2
+      with:
+        version: 7
+        run_install: false
+    - uses: actions/setup-node@v3.6.0
+      with:
+        node-version: 18.x
+        cache: 'pnpm'
+    - run: corepack enable
+    - run: pnpm i --frozen-lockfile
+
+  lint:
+    needs: [pnpm_install]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        workspace:
+        - backend
+        - frontend
+        - sw
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: pnpm/action-setup@v2
+      with:
+        version: 7
+        run_install: false
+    - uses: actions/setup-node@v3.6.0
+      with:
+        node-version: 18.x
+        cache: 'pnpm'
+    - run: corepack enable
+    - run: pnpm i --frozen-lockfile
+    - run: pnpm --filter ${{ matrix.workspace }} run eslint
+
+  typecheck:
+    needs: [pnpm_install]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        workspace:
+        - backend
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: pnpm/action-setup@v2
+      with:
+        version: 7
+        run_install: false
+    - uses: actions/setup-node@v3.6.0
+      with:
+        node-version: 18.x
+        cache: 'pnpm'
+    - run: corepack enable
+    - run: pnpm i --frozen-lockfile
+    - run: pnpm --filter ${{ matrix.workspace }} run typecheck

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

@@ -1,7 +1,5 @@
 # Run secret-dependent integration tests only after /deploy approval
 on:
-  pull_request:
-    types: [opened, reopened, synchronize]
   repository_dispatch:
     types: [deploy-command]
 
@@ -12,11 +10,10 @@ jobs:
   deploy-preview-environment:
     runs-on: ubuntu-latest
     if:
-      github.event_name == 'repository_dispatch' &&
       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@v5
+    - uses: actions/github-script@v6.3.3
       id: check-id
       env:
         number: ${{ github.event.client_payload.pull_request.number }}
@@ -40,7 +37,7 @@ jobs:
 
           return check[0].id;
 
-    - uses: actions/github-script@v5
+    - uses: actions/github-script@v6.3.3
       env:
         check_id: ${{ steps.check-id.outputs.result }}
         details_url: ${{ github.server_url }}/${{ github.repository }}/runs/${{ github.run_id }}
@@ -56,7 +53,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.3.0
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 
@@ -75,7 +72,7 @@ jobs:
         timeout: 15m
 
     # Update check run called "integration-fork"
-    - uses: actions/github-script@v5
+    - uses: actions/github-script@v6.3.3
       id: update-check-run
       if: ${{ always() }}
       env:

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

@@ -9,6 +9,7 @@ name: Destroy preview environment
 jobs:
   destroy-preview-environment:
     runs-on: ubuntu-latest
+    if: github.repository == github.event.pull_request.head.repo.full_name
     steps:
       - name: Context
         uses: okteto/context@latest

.github/workflows/test.yml

@@ -23,31 +23,35 @@ jobs:
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
-          YARN_CHECKSUM_BEHAVIOR: update
       redis:
         image: redis:6
         ports:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.3.0
       with:
         submodules: true
+    - name: Install pnpm
+      uses: pnpm/action-setup@v2
+      with:
+        version: 7
+        run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.2.0
+      uses: actions/setup-node@v3.6.0
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
+        cache: 'pnpm'
     - run: corepack enable
-    - run: yarn install --immutable
-    - name: Check yarn.lock
-      run: git diff --exit-code yarn.lock
+    - run: pnpm i --frozen-lockfile
+    - name: Check pnpm-lock.yaml
+      run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
       run: cp .github/misskey/test.yml .config
     - name: Build
-      run: yarn build
+      run: pnpm build
     - name: Test
-      run: yarn jest-and-coverage
+      run: pnpm jest-and-coverage
     - name: Upload Coverage
       uses: codecov/codecov-action@v3
       with:
@@ -77,7 +81,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.3.0
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150
@@ -86,27 +90,34 @@ jobs:
     #  if: ${{ matrix.browser == 'firefox' }}
     #- uses: browser-actions/setup-firefox@latest
     #  if: ${{ matrix.browser == 'firefox' }}
+    - name: Install pnpm
+      uses: pnpm/action-setup@v2
+      with:
+        version: 7
+        run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.2.0
+      uses: actions/setup-node@v3.6.0
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
+        cache: 'pnpm'
     - run: corepack enable
-    - run: yarn install --immutable
-      env:
-        YARN_CHECKSUM_BEHAVIOR: update
+    - run: pnpm i --frozen-lockfile
     - name: Copy Configure
       run: cp .github/misskey/test.yml .config
     - name: Build
-      run: yarn build
+      run: pnpm build
     # https://github.com/cypress-io/cypress/issues/4351#issuecomment-559489091
     - name: ALSA Env
       run: echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
+    # XXX: This tries reinstalling Cypress if the binary is not cached
+    # Remove this when the cache issue is fixed
+    - name: Cypress install
+      run: pnpm exec cypress install
     - name: Cypress run
-      uses: cypress-io/github-action@v4
+      uses: cypress-io/github-action@v5
       with:
         install: false
-        start: yarn start:test
+        start: pnpm start:test
         wait-on: 'http://localhost:61812'
         headless: false
         browser: ${{ matrix.browser }}

.gitignore

@@ -30,7 +30,10 @@ coverage
 # config
 /.config/*
 !/.config/example.yml
+!/.config/docker_example.yml
 !/.config/docker_example.env
+docker-compose.yml
+!/.devcontainer/docker-compose.yml
 
 # misskey
 /build

.node-version

@@ -1 +1 @@
-v18.12.1
+v18.13.0

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "search.exclude": {
+        "**/node_modules": true
+    },
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

.yarnrc

@@ -1 +0,0 @@
-network-timeout 600000

.yarnrc.yml

@@ -1,42 +0,0 @@
-httpTimeout: 600000
-
-nmHoistingLimits: none
-
-nodeLinker: pnpm
-
-packageExtensions:
-  "@bull-board/api@*":
-    peerDependencies:
-      "@bull-board/ui": "*"
-  "@tensorflow/tfjs@*":
-    dependencies:
-      long: "*"
-  chartjs-adapter-date-fns@*:
-    peerDependencies:
-      date-fns: "*"
-  consolidate@*:
-    dependencies:
-      ejs: "*"
-  # these are needed to extend fastify types
-  "@fastify/accepts@*":
-    peerDependencies:
-      fastify: "*"
-  "@fastify/cookie@*":
-    peerDependencies:
-      fastify: "*"
-  "@fastify/static@*":
-    peerDependencies:
-      fastify: "*"
-  "@fastify/view@*":
-    peerDependencies:
-      fastify: "*"
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-progressBarStyle: patrick
-
-yarnPath: .yarn/releases/yarn-3.3.0.cjs

CHANGELOG.md

@@ -2,14 +2,318 @@
 ## 13.x.x (unreleased)
 
 ### Improvements
+-
 
 ### Bugfixes
 -
 
 You should also include the user name that made the change.
 -->
+## 13.7.5 (2023/02/24)
 
-## 13.0.0 (unreleased)
+### Note
+13.7.0以前から直接このバージョンにアップデートする場合は全ての通知が削除**されません。**
+
+### Improvements
+- 紛らわしいため公開範囲の「ローカルのみ」オプションの名称を「連合なし」に変更
+- Frontend: スマホ・タブレットの場合、チャンネルの投稿フォームに自動でフォーカスしないように
+
+### Bugfixes
+- 全ての通知が削除されてしまうのを修正
+
+## 13.7.3 (2023/02/23)
+
+### Note
+~~13.7.0以前から直接このバージョンにアップデートする場合は全ての通知が削除**されません。**~~
+
+### Improvements
+
+### Bugfixes
+- Client: 「キャッシュを削除」した後、ローカルのカスタム絵文字が表示されなくなるされなくなる問題を修正
+- Client: 通知設定画面で以前からグループの招待を有効化していた場合、通知の表示に失敗する問題の修正
+- Client: 通知設定画面に古いトグルが残っていた問題を修正
+
+## 13.7.2 (2023/02/23)
+
+### Note
+13.7.0以前からアップデートする場合は全ての通知が削除されます。
+
+### Improvements
+- enhance: make pwa icon maskable
+- chore(client): tweak custom emoji size
+
+### Bugfixes
+- マイグレーションが失敗することがあるのを修正
+
+## 13.7.1 (2023/02/23)
+
+### Improvements
+- pnpm buildではswcを使うように
+
+### Bugfixes
+- NODE_ENV=productionでビルドできないのを修正
+
+## 13.7.0 (2023/02/22)
+
+### Changes
+- チャット機能が削除されました
+
+### Improvements
+- Server: URLプレビュー（summaly）はプロキシを通すように
+- Client: 2FA設定のUIをまともにした
+- セキュリティキーの名前を変更できるように
+- enhance(client): add quiz preset for play
+- 広告開始時期を設定できるように
+- みつけるで公開ロール一覧とそのメンバーを閲覧できるように
+- enhance(client): MFMのx3, x4が含まれていたらノートをたたむように
+- enhance(client): make possible to reload page of window
+
+### Bugfixes
+- ユーザー検索ダイアログでローカルユーザーを絞って検索できない問題を修正
+- fix(client): MkHeader及びデッキのカラムでチャンネル一覧を選択したとき、最大5個までしか表示されない
+- 管理画面の広告を10個以上見えるように
+- Moderation note が保存できない
+- ユーザーのハッシュタグ検索が機能していないのを修正
+
+## 13.6.1 (2023/02/12)
+
+### Improvements
+- アニメーションを少なくする設定の時、MkPageHeaderのタブアニメーションを無効化
+- Backend: activitypub情報がcorsでブロックされないようヘッダーを追加
+- enhance: レートリミットを0%にできるように
+- チャンネル内Renoteを行えるように
+
+### Bugfixes
+- Client: ユーザーページでアクティビティを見ることができない問題を修正
+
+## 13.6.0 (2023/02/11)
+
+### Improvements
+- MkPageHeaderをごっそり変えた
+  * モバイルではヘッダーは上下に分割され、下段にタブが表示されるように
+  * iconOnlyのタブ項目がアクティブな場合にはタブのタイトルを表示するように
+  * メインタイムラインではタイトルを表示しない
+  * メインタイムラインかつモバイルで表示される左上のアバターを選択するとアカウントメニューが開くように
+- ユーザーページのノート一覧をタブとして分離
+- コンディショナルロールもバッジとして表示可能に
+- enhance(client): ロールをより簡単に付与できるように
+- enhance(client): 一度見たノートのRenoteは省略して表示するように
+- enhance(client): 迷惑になる可能性のある投稿を行う前に警告を表示
+- リアクションの数が多い場合の表示を改善
+- 一部のMFM構文をopt-outに
+
+### Bugfixes
+- Client: ユーザーページでタブがほとんど見れないことがないように
+
+## 13.5.6 (2023/02/10)
+
+### Improvements
+- 非ログイン時にMiAuthを踏んだ際にMiAuthであることを表示する
+- /auth/のUIをアップデート
+- 利用規約同意UIの調整
+- クロップ時の質問を分かりやすく
+
+### Bugfixes
+- fix: prevent clipping audio plyr's tooltip
+
+## 13.5.4 (2023/02/09)
+
+### Improvements
+- Server: UIのHTML（ノートなどの特別なページを除く）のキャッシュ時間を15秒から30秒に
+- i/notificationsのレートリミットを緩和
+
+### Bugfixes
+- fix(client): validate url to improve security
+- fix(client): dateの初期値が正常に入らない時がある
+
+## 13.5.3 (2023/02/09)
+
+### Improvements
+- Client: デッキにチャンネルカラムを追加
+
+## 13.5.2 (2023/02/08)
+
+### Changes
+- Revert: perf(client): do not render custom emojis in user names
+
+### Bugfixes
+- Client: register_note_view_interruptor not working
+- Client: ログイントークンの再生成が出来ない
+
+## 13.5.0 (2023/02/08)
+
+### Changes
+- perf(client): do not render custom emojis in user names
+
+### Improvements
+- Client: disableShowingAnimatedImagesのデフォルト値をprefers-reduced-motionにする
+- enhance(client): tweak medialist style
+
+### Bugfixes
+- fix docker health check
+- Client: MkEmojiPickerでもChromeで検索ダイアログで変換確定するとそのまま検索されてしまうのを修正
+- fix(mfm): default degree not used in rotate
+- fix(server): validate urls from ap to improve security
+
+## 13.4.0 (2023/02/05)
+
+### Improvements
+- ロールにアイコンを設定してユーザー名の横に表示できるように
+- feat: timeline page for non-login users
+- 実績の単なるラッキーの獲得確立を調整
+- Add Thai language support
+
+### Bugfixes
+- fix(server): 自分のノートをお気に入りに登録しても実績解除される問題を修正
+- fix(server): clean up file in FileServer
+- fix(server): Deny UNIX domain socket
+- fix(server): validate filename and emoji name to improve security
+- fix(client): validate input response in aiscript
+- fix(client): add webhook delete button
+- fix(client): tweak notification style
+- fix(client): インラインコードを折り返して表示する
+
+## 13.3.3 (2023/02/04)
+
+### Bugfixes
+- Server: improve security
+
+## 13.3.2 (2023/02/04)
+
+### Improvements
+- 外部メディアプロキシへの対応を強化しました  
+  外部メディアプロキシのFastify実装を作りました  
+  https://github.com/misskey-dev/media-proxy
+- Server: improve performance
+
+### Bugfixes
+- Client: validate urls to improve security
+
+## 13.3.1 (2023/02/04)
+
+### Bugfixes
+- Client: カスタム絵文字にアニメーション画像を再生しない設定が適用されていない問題を修正
+- Client: オートコンプリートでUnicode絵文字がカスタム絵文字として表示されてしまうのを修正
+- Client: Fix Vue-plyr CORS issue
+- Client: validate urls to improve security
+
+## 13.3.0 (2023/02/03)
+### Changes
+- twitter/github/discord連携機能が削除されました
+- ハッシュタグごとのチャートが削除されました
+- syslogのサポートが削除されました
+
+### Improvements
+- ロールで広告の非表示が有効になっている場合は最初から広告を非表示にするように
+
+## 13.2.6 (2023/02/01)
+### Changes
+- docker-compose.ymlをdocker-compose.yml.exampleにしました。docker-compose.ymlとしてコピーしてから使用してください。
+
+### Improvements
+- 絵文字ピッカーのパフォーマンスを改善
+- AiScriptを0.12.4に更新
+
+### Bugfixes
+- Server: リレーと通信できない問題を修正
+- Client: classicモード使用時にwindowサイズによってdefaultに変更された後に、windowサイズが元に戻ったらclassicに戻すように修正 #9669
+- Client: Chromeで検索ダイアログで変換確定するとそのまま検索されてしまう問題を修正
+
+## 13.2.4 (2023/01/27)
+### Improvements
+- リモートカスタム絵文字表示時のパフォーマンスを改善
+- Default to `animation: false` when prefers-reduced-motion is set
+- リアクション履歴が公開なら、ログインしていなくても表示できるように
+- tweak blur setting
+- tweak custom emoji cache
+
+### Bugfixes
+- fix aggregation of retention
+- ダッシュボードでオンラインユーザー数が表示されない問題を修正
+- フォロー申請・フォローのボタンが、通知から消えている問題を修正
+
+## 13.2.3 (2023/01/26)
+### Improvements
+- カスタム絵文字の更新をリアルタイムで反映するように
+
+### Bugfixes
+- turnstile-failed: missing-input-secret
+
+## 13.2.2 (2023/01/25)
+### Improvements
+- サーバーのパフォーマンスを改善
+
+### Bugfixes
+- サインイン時に誤ったレートリミットがかかることがある問題を修正
+- MFMのposition、rotate、scaleで小数が使えない問題を修正
+
+## 13.2.1 (2023/01/24)
+### Improvements
+- デザインの調整
+- サーバーのパフォーマンスを改善
+
+## 13.2.0 (2023/01/23)
+
+### Improvements
+- onlyServer / onlyQueue オプションを復活
+- 他人の実績閲覧時は獲得条件を表示しないように
+- アニメーション減らすオプション有効時はリアクションのアニメーションを無効に
+- カスタム絵文字一覧のパフォーマンスを改善
+
+### Bugfixes
+- Aiscript: button is not defined
+
+## 13.1.7 (2023/01/22)
+
+### Improvements
+- 新たな実績を追加
+- MFMにscaleタグを追加
+
+## 13.1.4 (2023/01/22)
+
+### Improvements
+- 新たな実績を追加
+
+### Bugfixes
+- Client: ローカリゼーション更新時にリロードが繰り返されることがあるのを修正
+
+## 13.1.3 (2023/01/22)
+
+### Bugfixes
+- Client: リアクションのカスタム絵文字の表示の問題を修正
+
+## 13.1.2 (2023/01/22)
+
+### Bugfixes
+- Client: リアクションのカスタム絵文字の表示の問題を修正
+
+## 13.1.1 (2023/01/22)
+
+### Improvements
+- ローカルのカスタム絵文字を表示する際のパフォーマンスを改善
+- Client: 瞬間的に大量の実績を解除した際の挙動を改善
+
+### Bugfixes
+- Client: アップデート時にローカリゼーションデータが更新されないことがあるのを修正
+
+## 13.1.0 (2023/01/21)
+
+### Improvements
+- 実績機能
+- Playのプリセットを追加
+- Playのscriptの文字数制限を緩和
+- AiScript GUIの強化
+- リアクション一覧詳細ダイアログを表示できるように
+- 存在しないカスタム絵文字をテキストで表示するように
+- Alt text in image viewer
+- ジョブキューのプロセスとWebサーバーのプロセスを分離
+
+### Bugfixes
+- playを削除する手段がなかったのを修正
+- The … button on notes does nothing when not logged in
+- twitterと連携するときに autwh is not a function になるのを修正
+
+## 13.0.0 (2023/01/16)
 
 ### TL;DR
 - New features (Role system, Misskey Play, New widgets, New charts, 🍪👈, etc)
@@ -20,7 +324,7 @@ You should also include the user name that made the change.
 
 ### Notable features
 - ロール機能
-	- 従来より柔軟にユーザーの権限を管理できます。例えば、「インスタンスのパトロンはアンテナを30個まで作れる」「基本的にLTLは見れないが、許可した人だけ見れる」「招待制インスタンスだけどユーザーなら誰でも他者を招待できる」のような運用はもちろん、「ローカルユーザーかつアカウント作成から1日未満のユーザーはパブリックな投稿を行えない」のように複数条件を組み合わせて、自動でロールを付与する設定も可能です。
+	- 従来より柔軟にユーザーのポリシーを管理できます。例えば、「インスタンスのパトロンはアンテナを30個まで作れる」「基本的にLTLは見れないが、許可した人だけ見れる」「招待制インスタンスだけどユーザーなら誰でも他者を招待できる」のような運用はもちろん、「ローカルユーザーかつアカウント作成から1日未満のユーザーはパブリックな投稿を行えない」のように複数条件を組み合わせて、自動でロールを付与する設定も可能です。
 - Misskey Play
 	- 従来の動的なPagesに代わる、新しいプラットフォームです。動的なコンテンツ(アプリケーション)に特化していて、Pagesに比べてはるかに柔軟なアプリケーションを作成可能です。
 
@@ -29,17 +333,20 @@ You should also include the user name that made the change.
 - Node.js 18.x or later is required
 - PostgreSQL 15.x is required
 	- Misskey not using 15 specific features at 13.0.0, but may do so in the future.
+	- Docker環境でPostgreSQLのアップデートを行う際のガイドはこちら: https://github.com/misskey-dev/misskey/pull/9641#issue-1536336620
 - Elasticsearchのサポートが削除されました
 	- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます
-- Migrate to Yarn Berry (v3.2.1) @ThatOneCalculator
-	- You may have to `yarn run clean-all`, `sudo corepack enable` and `yarn set version berry` before running `yarn install` if you're still on yarn classic
+- Yarnからpnpmに移行されました
+  corepackの有効化を推奨します: `sudo corepack enable`
 - インスタンスブロックはサブドメインにも適用されるようになります
 - ロールの導入に伴い、いくつかの機能がロールと統合されました
 	- モデレーターはロールに統合されました。今までのモデレーター情報は失われるため、予めモデレーター一覧を記録しておき、アップデート後にモデレーターロールを作りアサインし直してください。
 	- サイレンスはロールに統合されました。今までのユーザーは恩赦されるため、予めサイレンス一覧を記録しておくのをおすすめします。
 	- ユーザーごとのドライブ容量設定はロールに統合されました。
-	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールのドライブ容量を編集してください。
+	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールもしくはコンディショナルロールでドライブ容量を編集してください。
 	- LTL/GTLの解放状態はロールに統合されました。
+- Dockerの実行をrootで行わないようにしました。Dockerかつオブジェクトストレージを使用していない場合は`chown -hR 991.991 ./files`を実行してください。  
+  https://github.com/misskey-dev/misskey/pull/9560
 
 #### For users
 - ノートのウォッチ機能が削除されました
@@ -52,6 +359,7 @@ You should also include the user name that made the change.
 	- 0.12.x未満のプラグインは読み込むことはできません
 - iOS15以下のデバイスはサポートされなくなりました
 - Firefox110以下はサポートされなくなりました
+  - 109でもContainerQueriesのフラグを有効にする事で問題なく使用できます
 
 #### For app developers
 - API: metaのレスポンスに`emojis`プロパティが含まれなくなりました
@@ -63,6 +371,7 @@ You should also include the user name that made the change.
 - API: `user`および`note`エンティティに`emojis`プロパティが含まれなくなりました
 - API: `user`エンティティに`avatarColor`および`bannerColor`プロパティが含まれなくなりました
 - API: `instance`エンティティに`latestStatus`、`lastCommunicatedAt`、`latestRequestSentAt`プロパティが含まれなくなりました
+- API: `instance`エンティティの`caughtAt`は`firstRetrievedAt`に名前が変わりました
 
 ### Improvements
 - Role system @syuilo
@@ -73,16 +382,22 @@ You should also include the user name that made the change.
 - Push notification of Antenna note @tamaina
 - AVIF support @tamaina
 - Add Cloudflare Turnstile CAPTCHA support @CyberRex0
+- レートリミットをユーザーごとに調整可能に @syuilo
 - 非モデレーターでも、権限を持つロールをアサインされたユーザーはインスタンスの招待コードを発行できるように @syuilo
 - 非モデレーターでも、権限を持つロールをアサインされたユーザーはカスタム絵文字の追加、編集、削除を行えるように @syuilo
+- クリップおよびクリップ内のノートの作成可能数を設定可能に @syuilo
+- ユーザーリストおよびユーザーリスト内のユーザーの作成可能数を設定可能に @syuilo
 - ハードワードミュートの最大文字数を設定可能に @syuilo
 - Webhookの作成可能数を設定可能に @syuilo
+- ノートをピン留めできる数を設定可能に @syuilo
 - Server: signToActivityPubGet is set to true by default @syuilo
 - Server: improve syslog performance @syuilo
 - Server: Use undici instead of node-fetch and got @tamaina
 - Server: Judge instance block by endsWith @tamaina
 - Server: improve note scoring for featured notes @CyberRex0
 - Server: アンケート選択肢の文字数制限を緩和 @syuilo
+- Server: プロフィールの文字数制限を緩和 @syuilo
+- Server: add rate limits for some endpoints @syuilo
 - Server: improve stats api performance @syuilo
 - Server: improve nodeinfo performance @syuilo
 - Server: delete outdated notifications regularly to improve db performance @syuilo
@@ -94,6 +409,7 @@ You should also include the user name that made the change.
 - Client: Add link to user RSS feed in profile menu @ssmucny
 - Client: Compress non-animated PNG files @saschanaz
 - Client: YouTube window player @sim1222
+- Client: show readable error when rate limit exceeded @syuilo
 - Client: enhance dashboard of control panel @syuilo
 - Client: Vite is upgraded to v4 @syuilo, @tamaina
 - Client: HMR is available while yarn dev @tamaina
@@ -115,11 +431,13 @@ You should also include the user name that made the change.
 - Client: add new mfm function (position, fg, bg) @syuilo
 - Client: show fireworks when visit user who today is birthday @syuilo
 - Client: show bot warning on screen when logged in as bot account @syuilo
+- Client: AiScriptからカスタム絵文字一覧を参照できるように @syuilo
 - Client: improve overall performance of client @syuilo
 - Client: ui tweaks @syuilo
 - Client: clicker game @syuilo
 
 ### Bugfixes
+- Server: Fix @tensorflow/tfjs-core's MODULE_NOT_FOUND error @ikuradon
 - Server: 引用内の文章がnyaizeされてしまう問題を修正 @kabo2468
 - Server: Bug fix for Pinned Users lookup on instance @squidicuzz
 - Server: Fix peers API returning suspended instances @ineffyble

CONTRIBUTING.md

@@ -44,7 +44,7 @@ Thank you for your PR! Before creating a PR, please check the following:
 - Check if there are any documents that need to be created or updated due to this change.
 - If you have added a feature or fixed a bug, please add a test case if possible.
 - Please make sure that tests and Lint are passed in advance.
-  - You can run it with `yarn test` and `yarn lint`. [See more info](#testing)
+  - You can run it with `pnpm test` and `pnpm lint`. [See more info](#testing)
 - If this PR includes UI changes, please attach a screenshot in the text.
 
 Thanks for your cooperation 🤗
@@ -83,11 +83,18 @@ An actual domain will be assigned so you can test the federation.
 	- The title must be in the format `Release: x.y.z`.
 		- `x.y.z` is the new version you are trying to release.
 3. Deploy and perform a simple QA check. Also verify that the tests passed.
-4. Merge it.
+4. Merge it. (Do not squash commit)
 5. Create a [release of GitHub](https://github.com/misskey-dev/misskey/releases)
 	- The target branch must be `master`
 	- The tag name must be the version
 
+> **Note**
+> Why this instruction is necessary:
+> - To perform final QA checks
+> - To distribute responsibility
+> - To check direct commits to develop
+> - To celebrate the release together 🎉
+
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
@@ -102,7 +109,7 @@ If your language is not listed in Crowdin, please open an issue.
 During development, it is useful to use the 
 
 ```
-yarn dev
+pnpm dev
 ```
 
 command.
@@ -111,8 +118,28 @@ command.
 - Vite HMR (just the `vite` command) is available. The behavior may be different from production.
 - Service Worker is watched by esbuild.
 
+### Dev Container
+Instead of running `pnpm` locally, you can use Dev Container to set up your development environment.
+To use Dev Container, open the project directory on VSCode with Dev Containers installed.  
+**Note:** If you are using Windows, please clone the repository with WSL. Using Git for Windows will result in broken files due to the difference in how newlines are handled.
+
+It will run the following command automatically inside the container.
+``` bash
+git submodule update --init
+pnpm install --frozen-lockfile
+cp .devcontainer/devcontainer.yml .config/default.yml
+pnpm build
+pnpm migrate
+```
+
+After finishing the migration, run the `pnpm dev` command to start the development server.
+
+``` bash
+pnpm dev
+```
+
 ## Testing
-- Test codes are located in [`/test`](/test).
+- Test codes are located in [`/packages/backend/test`](/packages/backend/test).
 
 ### Run test
 Create a config file.
@@ -121,18 +148,18 @@ cp .github/misskey/test.yml .config/
 ```
 Prepare DB/Redis for testing.
 ```
-docker-compose -f packages/backend/test/docker-compose.yml up
+docker compose -f packages/backend/test/docker-compose.yml up
 ```
 Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`. 
 
 Run all test.
 ```
-yarn test
+pnpm test
 ```
 
 #### Run specify test
 ```
-yarn jest -- foo.ts
+pnpm jest -- foo.ts
 ```
 
 ### e2e tests
@@ -177,9 +204,9 @@ vue-routerとの最大の違いは、niraxは複数のルーターが存在す
 これにより、アプリ内ウィンドウでブラウザとは個別にルーティングすることなどが可能になります。
 
 ## Notes
-### How to resolve conflictions occurred at yarn.lock?
+### How to resolve conflictions occurred at pnpm-lock.yaml?
 
-Just execute `yarn` to fix it.
+Just execute `pnpm` to fix it.
 
 ### INSERTするときにはsaveではなくinsertを使用する
 #6441
@@ -258,14 +285,15 @@ SQLでは配列のインデックスは**1始まり**。
 ### null IN
 nullが含まれる可能性のあるカラムにINするときは、そのままだとおかしくなるのでORなどでnullのハンドリングをしよう。
 
-### `undefined`にご用心
-MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
-MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
+### enumの削除は気をつける
+enumの列挙の内容の削除は、その値をもつレコードを全て削除しないといけない
+
+削除が重たかったり不可能だったりする場合は、削除しないでおく
 
 ### Migration作成方法
 packages/backendで:
 ```sh
-yarn dlx typeorm migration:generate -d ormconfig.js -o <migration name>
+pnpm dlx typeorm migration:generate -d ormconfig.js -o <migration name>
 ```
 
 - 生成後、ファイルをmigration下に移してください

COPYING

@@ -1,5 +1,5 @@
 Unless otherwise stated this repository is
-Copyright © 2014-2022 syuilo and contributers
+Copyright © 2014-2023 syuilo and contributers
 
 And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
 

Dockerfile

@@ -1,45 +1,68 @@
-FROM node:18.13.0-bullseye AS builder
+# syntax = docker/dockerfile:1.4
+
+ARG NODE_VERSION=18.13.0-bullseye
+
+FROM node:${NODE_VERSION} AS builder
+
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+	--mount=type=cache,target=/var/lib/apt,sharing=locked \
+	rm -f /etc/apt/apt.conf.d/docker-clean \
+	; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+	&& apt-get update \
+	&& apt-get install -yqq --no-install-recommends \
+	build-essential
+
+RUN corepack enable
+
+WORKDIR /misskey
+
+COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
+COPY --link ["scripts", "./scripts"]
+COPY --link ["packages/backend/package.json", "./packages/backend/"]
+COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
+COPY --link ["packages/sw/package.json", "./packages/sw/"]
+
+RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
+	pnpm i --frozen-lockfile --aggregate-output
+
+COPY --link . ./
 
 ARG NODE_ENV=production
 
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
-	build-essential
-
-WORKDIR /misskey
-
-COPY [".yarnrc.yml", "package.json", "yarn.lock", "./"]
-COPY [".yarn", "./.yarn"]
-COPY ["scripts", "./scripts"]
-COPY ["packages/backend/package.json", "./packages/backend/"]
-COPY ["packages/frontend/package.json", "./packages/frontend/"]
-COPY ["packages/sw/package.json", "./packages/sw/"]
-
-RUN yarn install --immutable
-
-COPY . ./
-
 RUN git submodule update --init
-RUN yarn build
+RUN pnpm build
+RUN rm -rf .git/
 
-FROM node:18.13.0-bullseye-slim AS runner
+FROM node:${NODE_VERSION}-slim AS runner
 
+ARG UID="991"
+ARG GID="991"
+
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+	--mount=type=cache,target=/var/lib/apt,sharing=locked \
+	rm -f /etc/apt/apt.conf.d/docker-clean \
+	; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
+	ffmpeg tini curl \
+	&& corepack enable \
+	&& groupadd -g "${GID}" misskey \
+	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
+	&& find / -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \
+	&& find / -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \;
+
+USER misskey
 WORKDIR /misskey
 
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
-	ffmpeg tini \
-	&& apt-get -y clean \
-	&& rm -rf /var/lib/apt/lists/*
-
-COPY --from=builder /misskey/.yarn/install-state.gz ./.yarn/install-state.gz
-COPY --from=builder /misskey/node_modules ./node_modules
-COPY --from=builder /misskey/built ./built
-COPY --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
-COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
-COPY --from=builder /misskey/packages/frontend/node_modules ./packages/frontend/node_modules
-COPY . ./
+COPY --chown=misskey:misskey --from=builder /misskey/node_modules ./node_modules
+COPY --chown=misskey:misskey --from=builder /misskey/built ./built
+COPY --chown=misskey:misskey --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
+COPY --chown=misskey:misskey --from=builder /misskey/packages/backend/built ./packages/backend/built
+COPY --chown=misskey:misskey --from=builder /misskey/packages/frontend/node_modules ./packages/frontend/node_modules
+COPY --chown=misskey:misskey --from=builder /misskey/fluent-emojis /misskey/fluent-emojis
+COPY --chown=misskey:misskey . ./
 
 ENV NODE_ENV=production
+HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["yarn", "run", "migrateandstart"]
+CMD ["pnpm", "run", "migrateandstart"]

README.md

@@ -24,6 +24,8 @@
 	
 ---
 
+[![codecov](https://codecov.io/gh/misskey-dev/misskey/branch/develop/graph/badge.svg?token=R6IQZ3QJOL)](https://codecov.io/gh/misskey-dev/misskey)
+
 </div>
 
 <div>

ROADMAP.md

@@ -5,17 +5,14 @@ Also, the later tasks are more indefinite and are subject to change as developme
 ## (1) Improve maintainability \<current phase\>
 This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
 
-- Make the number of type errors zero (backend)
-	- Probably need to switch some libraries to others that make it difficult to reduce type errors
-		- e.g. koa to fastify https://github.com/misskey-dev/misskey/issues/7537
+- ~~Make the number of type errors zero (backend)~~ → Done ✔️
 - Improve CI
-	- Fix tests
-		- mocha, jest, etc. do not support the combination of `TypeScript + ESM + Path alias`, and the tests currently do not work.
+	- ~~Fix tests~~ → Done ✔️
 	- Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
 	- Add more tests
-		- May need to implement a mechanism that allows for DI
+		- ~~May need to implement a mechanism that allows for DI~~ → Done ✔️
 			- https://github.com/misskey-dev/misskey/pull/9085
-	- Measure coverage
+	- ~~Measure coverage~~ → Done ✔️
 		- https://github.com/misskey-dev/misskey/pull/9081
 - Improve documentation
 - Refactoring

chart/Chart.yaml

@@ -1,3 +1,4 @@
 apiVersion: v2
 name: misskey
 version: 0.0.0
+description: This chart is created for the purpose of previewing Pull Requests. Do not use this for production use.

chart/files/default.yml

@@ -133,11 +133,6 @@ id: "aid"
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
 
-# Syslog option
-#syslog:
-#  host: localhost
-#  port: 514
-
 # Proxy for HTTP/HTTPS
 #proxy: http://127.0.0.1:3128
 

codecov.yml

@@ -0,0 +1,5 @@
+coverage:
+  status:
+    project:
+      default:
+        only_pulls: true

cypress/e2e/widgets.cy.js

@@ -29,17 +29,17 @@ describe('After user signed in', () => {
 
 	it('first widget should be removed', () => {
 		cy.get('.mk-widget-edit').click();
-		cy.get('.customize-container:first-child .remove._button').click();
-		cy.get('.customize-container').should('have.length', 2);
+		cy.get('.data-cy-customize-container:first-child .data-cy-customize-container-remove._button').click();
+		cy.get('.data-cy-customize-container').should('have.length', 2);
 	});
 
 	function buildWidgetTest(widgetName) {
 		it(`${widgetName} widget should get added`, () => {
 			cy.get('.mk-widget-edit').click();
 			cy.get('.mk-widget-select select').select(widgetName, { force: true });
-			cy.get('.bg._modalBg.transparent').click({ multiple: true, force: true });
+			cy.get('.data-cy-bg._modalBg.data-cy-transparent').click({ multiple: true, force: true });
 			cy.get('.mk-widget-add').click({ force: true });
-			cy.get(`.mkw-${widgetName}`).should('exist');
+			cy.get(`.data-cy-mkw-${widgetName}`).should('exist');
 		});
 	}
 

docker-compose.yml.example

@@ -8,6 +8,11 @@ services:
       - db
       - redis
 #      - es
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     ports:
       - "3000:3000"
     networks:
@@ -19,21 +24,29 @@ services:
 
   redis:
     restart: always
-    image: redis:4.0-alpine
+    image: redis:7-alpine
     networks:
       - internal_network
     volumes:
       - ./redis:/data
+    healthcheck:
+      test: "redis-cli ping"
+      interval: 5s
+      retries: 20
 
   db:
     restart: always
-    image: postgres:12.2-alpine
+    image: postgres:15-alpine
     networks:
       - internal_network
     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
 
 #  es:
 #    restart: always

gulpfile.js

@@ -20,7 +20,7 @@ gulp.task('copy:frontend:fonts', () =>
 );
 
 gulp.task('copy:frontend:tabler-icons', () =>
-	gulp.src('./packages/frontend/node_modules/@tabler/icons/iconfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
+	gulp.src('./packages/frontend/node_modules/@tabler/icons-webfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
 );
 
 gulp.task('copy:frontend:locales', cb => {

healthcheck.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+PORT=$(grep '^port:' /misskey/.config/default.yml | awk 'NR==1{print $2; exit}')
+curl -s -S -o /dev/null "http://localhost:${PORT}"

locales/ar-SA.yml

@@ -108,6 +108,7 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "التفاعلات"
+reactions: "التفاعلات"
 reactionSetting: "التفاعلات المراد عرضها في منتقي التفاعلات."
 reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
@@ -378,13 +379,10 @@ about: "عن"
 aboutMisskey: "عن Misskey"
 administrator: "المدير"
 token: "الرمز المميز"
-twoStepAuthentication: "الإستيثاق بعاملَيْن"
 moderator: "مشرِف"
 moderation: "الإشراف"
 nUsersMentioned: "{n} مستخدمين أُشير إليهم"
 securityKey: "مفتاح الأمان"
-securityKeyName: "اسم المفتاح"
-registerSecurityKey: "سجل مفتاح أمان"
 lastUsed: "آخر استخدام"
 unregister: "إلغاء التسجيل"
 passwordLessLogin: "لِج مِن دون كلمة سرية"
@@ -402,24 +400,15 @@ markAsReadAllTalkMessages: "علّم جميع الرسائل كمقروءة"
 help: "المساعدة"
 inputMessageHere: "اكتب رسالتك هنا"
 close: "اغلق"
-group: "الفريق"
-groups: "الفِرَق"
-createGroup: "انشئ فريقًا"
-ownedGroups: "فِرقي"
-joinedGroups: "الفِرق المُنضم إليها"
 invites: "دعوة"
-groupName: "اسم الفريق"
 members: "الأعضاء"
 transfer: "نقل"
-messagingWithUser: "تحدث مع مستخدم"
-messagingWithGroup: "محادثة جماعية"
 title: "العنوان"
 text: "النص"
 enable: "تشغيل"
 next: "التالية"
 retype: "أعد الكتابة"
 noteOf: "ملاحظات {user}"
-inviteToGroup: "دعوة إلى فريق"
 quoteAttached: "اِقتُبسَ"
 quoteQuestion: "أتريد تضمينها كاقتباس"
 noMessagesYet: "ليس هناك رسائل بعد"
@@ -441,14 +430,10 @@ passwordMatched: "التطابق صحيح!"
 passwordNotMatched: "غير متطابقتان"
 signinWith: "الولوج عبر {x}"
 signinFailed: "فشل الولوج، خطأ في اسم المستخدم أو كلمة المرور."
-tapSecurityKey: "أنقر مفتاح الأمان"
 or: "أو"
 language: "اللغة"
 uiLanguage: "لغة واجهة المستخدم"
-groupInvited: "دُعيت إلى فريقٍ"
 aboutX: "عن {x}"
-youHaveNoGroups: "لا تمتلك أية فِرَق"
-joinOrCreateGroup: "احصل على دعوة لفريق أو أنشئ واحدًا."
 noHistory: "السجل فارغ"
 signinHistory: "تاريخ تسجيل الدخول"
 doing: "انتظر لحظة"
@@ -789,8 +774,6 @@ deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد الم
 incorrectPassword: "كلمة السر خاطئة."
 voteConfirm: "متيقِّن من تصويتك لـ {choice}؟"
 hide: "إخفاء"
-leaveGroup: "مغادرة الفريق"
-leaveGroupConfirm: "متيقن من مغادرة \"{name}\"؟"
 welcomeBackWithName: "مرحبًا بك مجددًا {name}"
 clickToFinishEmailVerification: "انقر [{ok}] لاستيثاق بريدك الإلكتروني."
 overridedDeviceKind: "نوع الجهاز"
@@ -818,6 +801,12 @@ cannotLoad: "تعذر التحميل"
 like: "أعجبني"
 show: "المظهر"
 color: "اللون"
+_role:
+  priority: "الأولوية"
+  _priority:
+    low: "منخفضة"
+    middle: "متوسط"
+    high: "عالية"
 _emailUnavailable:
   used: "هذا البريد الإلكتروني مستخدم"
   format: "صيغة البريد الإلكتروني غير صالحة"
@@ -841,6 +830,7 @@ _accountDelete:
 _ad:
   back: "رجوع"
   reduceFrequencyOfThisAd: "قلل عرض هذا الإعلان"
+  hide: "لا تظهره بتاتًا"
 _forgotPassword:
   enterEmail: "أدخل البريد الإلكتروني المرتبط بحسابك لكي يرسل إليك رابط لإعادة تعيين كلمة المرور."
   ifNoEmail: "إذا لم تربط حسابك ببريد إلكتروني سيتوجب عليك التواصل مع مدير الموقع."
@@ -878,56 +868,6 @@ _nsfw:
   respect: "اخف الوسائط ذات المحتوى الحساس"
   ignore: "اعرض الوسائط ذات المحتوى الحساس"
   force: "اخف كل الوسائط"
-_mfm:
-  cheatSheet: "مرجع ملخص عن MFM"
-  intro: "MFM هي لغة ترميزية مخصصة  يمكن استخدامها في عدّة أماكن في ميسكي. يمكنك مراجعة كل تعابيرها مع كيفية استخدامها هنا."
-  mention: "أشر الى"
-  mentionDescription: "يمكنك الإشارة لمستخدم معيّن من خلال كتابة @ متبوعة باسم مستخدم."
-  hashtag: "الوسوم"
-  hashtagDescription: "يمكنك تعيين وسم من خلال كتابة # متبوعة بالنص المطلوب."
-  url: "الرابط"
-  urlDescription: "يمكن عرض الروابط"
-  link: "رابط"
-  bold: "عريض"
-  boldDescription: "جعل الحروف أثخن لإبرازها."
-  small: "صغير"
-  smallDescription: "يعرض المحتوى صغيرًا ورفيعًا."
-  center: "وسط"
-  centerDescription: "يمركز المحتوى في الوَسَط."
-  quote: "اقتبس"
-  quoteDescription: "يعرض المحتوى كاقتباس"
-  emoji: "إيموجي مخصص"
-  emojiDescription: "إحاطة اسم الإيموجي بنقطتي تفسير سيستبدله بصورة الإيموجي."
-  search: "البحث"
-  searchDescription: "يعرض نصًا في صندوق البحث"
-  flip: "اقلب"
-  flipDescription: "يقلب المحتوى عموديًا أو أفقيًا"
-  jelly: "تأثير (هلام)"
-  jellyDescription: "يمنح المحتوى حركة هلامية."
-  tada: "تأثير (تادا)"
-  tadaDescription: "يمنح للمحتوى تأثير تادا"
-  jump: "تأثير (قفز)"
-  jumpDescription: "يمنح للمحتوى حركة قفز."
-  bounce: "تأثير (ارتداد)"
-  bounceDescription: "يمنح للمحتوى حركة ارتدادية"
-  shake: "تأثير (اهتزاز)"
-  shakeDescription: "يمنح المحتوى حركة اهتزازية."
-  spin: "تأثير (دوران)"
-  spinDescription: "يمنح المحتوى حركة دورانية."
-  x2: "كبير"
-  x2Description: "يُكبر المحتوى"
-  x3: "كبير جداً"
-  x3Description: "يُضخم المحتوى"
-  x4: "هائل"
-  x4Description: "يُضخم المحتوى أكثر مما سبق."
-  blur: "طمس"
-  blurDescription: "يطمس المحتوى، لكن بالتمرير فوقه سيظهر بوضوح."
-  font: "الخط"
-  fontDescription: "الخط المستخدم لعرض المحتوى."
-  rainbow: "قوس قزح"
-  rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
-  rotate: "تدوير"
-  rotateDescription: "يُدير المحتوى بزاوية معيّنة."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
@@ -1061,12 +1001,11 @@ _tutorial:
   step7_3: "حظًا سعيدًا واستمتع بوقتك مع ميسكي! 🚀"
 _2fa:
   alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
-  registerDevice: "سجّل جهازًا جديدًا"
-  registerKey: "تسجيل مفتاح أمان جديد"
   step1: "أولًا ثبّت تطبيق استيثاق على جهازك (مثل {a} و{b})."
   step2: "امسح رمز الاستجابة السريعة الموجد على الشاشة."
   step3: "أدخل الرمز الموجود في تطبيقك لإكمال التثبيت."
   step4: "من هذه اللحظة أثناء ولوجك سيُطلب منك الرمز."
+  renewTOTPCancel: "ليس اﻵن"
 _permissions:
   "read:account": "اعرض معلومات حسابك"
   "write:account": "تعديل معلومات حسابك"
@@ -1175,8 +1114,6 @@ _visibility:
   followersDescription: "اجعلها مرئية لمتابِعيك فقط"
   specified: "مباشرة"
   specifiedDescription: "اجعلها مرئية لمستخدمين محددين"
-  localOnly: "المحلي فقط"
-  localOnlyDescription: "ليس مرئيًا للمستخدمين البِعاد"
 _postForm:
   replyPlaceholder: "رد على هذه الملاحظة…"
   quotePlaceholder: "اقتبس هذه الملاحظة…"
@@ -1297,12 +1234,9 @@ _notification:
   youGotReply: "ردّ عليك {name}"
   youGotQuote: "اقتبس منك {name}"
   youRenoted: "إعادت نشر من {name}"
-  youGotMessagingMessageFromUser: "لقد تلقيت رسالة مِن {name}"
-  youGotMessagingMessageFromGroup: "لقد أرسِلَت رسالة إلى الفريق {name}"
   youWereFollowed: "يتابعك"
   youReceivedFollowRequest: "تلقيتَ طلب متابعة"
   yourFollowRequestAccepted: "قُبل طلب المتابعة"
-  youWereInvitedToGroup: "دُعيت إلى فريقٍ"
   pollEnded: "ظهرت نتائج الاستطلاع"
   unreadAntennaNote: "هوائي {name}"
   _types:
@@ -1315,7 +1249,6 @@ _notification:
     reaction: "التفاعلات"
     receiveFollowRequest: "طلبات المتابعة المتلقاة"
     followRequestAccepted: "طلبات المتابعة المقبولة"
-    groupInvited: "دعوات الفريق"
     app: "إشعارات التطبيقات المرتبطة"
   _actions:
     followBack: "تابعك بالمثل"
@@ -1337,5 +1270,6 @@ _deck:
     tl: "الخيط الزمني"
     antenna: "الهوائيات"
     list: "القوائم"
+    channel: "القنوات"
     mentions: "الإشارات"
     direct: "مباشرة"

locales/bn-BD.yml

@@ -107,6 +107,7 @@ clickToShow: "দেখার জন্য ক্লিক করুন"
 sensitive: "সংবেদনশীল বিষয়বস্তু"
 add: "যুক্ত করুন"
 reaction: "প্রতিক্রিয়া"
+reactions: "প্রতিক্রিয়া"
 reactionSetting: "রিঅ্যাকশন পিকারে যেসকল প্রতিক্রিয়া দেখানো হবে"
 reactionSettingDescription2: "পুনরায় সাজাতে টেনে আনুন, মুছতে ক্লিক করুন, যোগ করতে + টিপুন।"
 rememberNoteVisibility: "নোটের দৃশ্যমান্যতার সেটিংস মনে রাখুন"
@@ -381,12 +382,9 @@ about: "আপনার সম্পর্কে"
 aboutMisskey: "Misskey সম্পর্কে"
 administrator: "প্রশাসক"
 token: "টোকেন"
-twoStepAuthentication: "২-ধাপ প্রমাণীকরণ"
 moderator: "মডারেটর"
 nUsersMentioned: "{n} জনকে উল্লেখ করা হয়েছে"
 securityKey: "সিকিউরিটি কী"
-securityKeyName: "কী'র নাম"
-registerSecurityKey: "সিকিউরিটি কী নিবন্ধন করুন"
 lastUsed: "শেষ ব্যাবহার করা হয়েছে"
 unregister: "নিবন্ধনমুক্ত হন"
 passwordLessLogin: "পাসওয়ার্ড-বিহীন লগইন সেট আপ করুন"
@@ -404,24 +402,15 @@ markAsReadAllTalkMessages: "সমস্ত মেসেজ পঠিত হি
 help: "সহায়তা"
 inputMessageHere: "এখানে মেসেজ লিখুন"
 close: "বন্ধ"
-group: "গ্রুপ"
-groups: "গ্রুপসমূহ"
-createGroup: "গ্রুপ তৈরী করুন"
-ownedGroups: "আপনার গ্রুপগুলি"
-joinedGroups: "যেসব গ্রুপে আপনি আছেন"
 invites: "আমন্ত্রণ"
-groupName: "গ্রুপের নাম"
 members: "সদস্যবৃন্দ"
 transfer: "হস্তান্তর"
-messagingWithUser: "প্রাইভেট চ্যাট"
-messagingWithGroup: "গ্রুপ চ্যাট"
 title: "শিরোনাম"
 text: "পাঠ্য"
 enable: "সক্রিয়"
 next: "পরবর্তী"
 retype: "পুনঃ প্রবেশ"
 noteOf: "{user} এর নোট"
-inviteToGroup: "গ্রুপে আমন্ত্রণ জানান"
 quoteAttached: "উদ্ধৃত"
 quoteQuestion: "উদ্ধৃতি হিসাবে সংযুক্ত করবেন?"
 noMessagesYet: "কোন মেসেজ নেই"
@@ -443,18 +432,13 @@ passwordMatched: "মিলেছে"
 passwordNotMatched: "মিলেনি"
 signinWith: "{x} এর সাহায্যে সাইন ইন করুন"
 signinFailed: "লগ ইন করা যায়নি। আপনার ব্যবহারকারীর নাম এবং পাসওয়ার্ড চেক করুন."
-tapSecurityKey: "সিকিউরিটি কী স্পর্শ করুন"
 or: "অথবা"
 language: "ভাষা"
 uiLanguage: "UI এর ভাষা"
-groupInvited: "আপনি একটি গ্রুপে আমন্ত্রিত হয়েছেন"
 aboutX: "{x} সম্পর্কে"
 disableDrawer: "ড্রয়ার মেনু প্রদর্শন করবেন না"
-youHaveNoGroups: "আপনার কোন গ্রুপ নেই "
-joinOrCreateGroup: "একটি বিদ্যমান গ্রুপের আমন্ত্রণ পান বা একটি নতুন গ্রুপ তৈরি করুন৷"
 noHistory: "কোনো ইতিহাস নেই"
 signinHistory: "প্রবেশ করার ইতিহাস"
-disableAnimatedMfm: "অ্যানিমেটেড MFM অক্ষম করুন"
 doing: "প্রক্রিয়া করছে..."
 category: "বিভাগ"
 tags: "ট‍্যাগসমূহ"
@@ -820,8 +804,6 @@ deleteAccountConfirm: "আপনার অ্যাকাউন্ট মুছ
 incorrectPassword: "আপনার দেওয়া পাসওয়ার্ডটি ভুল।"
 voteConfirm: "\"{choice}\" এ ভোট দিতে চান？"
 hide: "লুকান"
-leaveGroup: "গ্রুপ ছেড়ে চলে যান"
-leaveGroupConfirm: "\"{name}\" গ্রুপ ছেড়ে চলে যেতে চান?"
 useDrawerReactionPickerForMobile: "মোবাইলে রিঅ্যাকশন পিকারকে ড্রয়ারে প্রদর্শন করুন"
 welcomeBackWithName: "আবার স্বাগতম, {name}"
 clickToFinishEmailVerification: " [{ok}] ক্লিক করার মাধ্যমে আপনার ইমেল ঠিকানা নিশ্চিত করুন।"
@@ -854,6 +836,12 @@ account: "অ্যাকাউন্টগুলি"
 like: "পছন্দ করা"
 show: "প্রদর্শন"
 color: "রং"
+_role:
+  priority: "অগ্রাধিকার"
+  _priority:
+    low: "নিম্ন"
+    middle: "মাঝারি"
+    high: "উচ্চ"
 _emailUnavailable:
   used: "এই ইমেইল ঠিকানাটি ইতোমধ্যে ব্যবহৃত হয়েছে"
   format: "এই ইমেল ঠিকানাটি সঠিকভাবে লিখা হয়নি"
@@ -878,6 +866,7 @@ _accountDelete:
 _ad:
   back: "পিছনে"
   reduceFrequencyOfThisAd: "এই বিজ্ঞাপনটি কম দেখান"
+  hide: "দেখাবেন না"
 _forgotPassword:
   enterEmail: "আপনি আপনার অ্যাকাউন্টের জন্য নিবন্ধিত ইমেল ঠিকানা লিখুন. সেই ঠিকানায় একটি পাসওয়ার্ড রিসেট লিঙ্ক পাঠানো হবে।"
   ifNoEmail: "আপনি যদি নিবন্ধনের সময় ই-মেইল ঠিকানা না দিয়ে থাকেন, তাহলে অনুগ্রহ করে প্রশাসকের সাথে যোগাযোগ করুন।"
@@ -915,70 +904,6 @@ _nsfw:
   respect: "স্পর্শকাতর মিডিয়া লুকান"
   ignore: "স্পর্শকাতর মিডিয়া লুকাবেন না"
   force: "সকল মিডিয়া লুকান"
-_mfm:
-  cheatSheet: "MFM চিটশিট"
-  intro: "MFM একটি মার্কআপ ভাষা যা Misskey-এর মধ্যে বিভিন্ন জায়গায় ব্যবহার করা যেতে পারে। এখানে আপনি MFM-এর সিনট্যাক্সগুলির একটি তালিকা দেখতে পারবেন।"
-  dummy: "মিসকি ফেডিভার্সের বিশ্বকে প্রসারিত করে"
-  mention: "উল্লেখ"
-  mentionDescription: "@ চিহ্ন + ব্যবহারকারীর নাম একটি নির্দিষ্ট ব্যবহারকারীকে নির্দেশ করতে ব্যবহার করা যায়।"
-  hashtag: "হ্যাশট্যাগ"
-  hashtagDescription: "আপনি একটি # চিহ্ন + ট্যাগ সহ একটি হ্যাশট্যাগ নির্দেশ করতে পারেন।"
-  url: "URL"
-  urlDescription: "URL দেখানো সম্ভব।"
-  link: "লিংক"
-  linkDescription: "আপনি পাঠ্যের একটি নির্দিষ্ট অংশকে URL হিসাবে দেখাতে পারেন৷"
-  bold: "গাঢ়"
-  boldDescription: "অক্ষরগুলিকে মোটাকরে প্রদর্শন করা হবে।"
-  small: "ছোট"
-  smallDescription: "লেখা ছোট এবং পাতলা করে দেখানো হবে।"
-  center: "সেন্টার"
-  centerDescription: "লেখা মাঝ বরাবর দেখানো হবে"
-  inlineCode: "কোড (ইনলাইন)"
-  inlineCodeDescription: " প্রোগ্রামের কোডের জন্য ইনলাইন সিনট্যাক্স হাইলাইটিং করা হবে"
-  blockCode: "কোড (ব্লক)"
-  blockCodeDescription: "মাল্টি-লাইন প্রোগ্রামের কোডের জন্য সিনট্যাক্স হাইলাইট করে।"
-  inlineMath: "গাণিতিক সূত্র (ইনলাইন)"
-  inlineMathDescription: "গাণিতিক সূত্র প্রদর্শন করুন (KaTeX) ইনলাইন।"
-  blockMath: "গাণিতিক সূত্র (ব্লক)"
-  blockMathDescription: "একটি ব্লকে একাধিক লাইনের গাণিতিক সূত্র প্রদর্শন করুন (KaTeX)।"
-  quote: "উদ্ধৃতি"
-  quoteDescription: "বিষয়বস্তুকে একটি উদ্ধৃতি হিসাবে দেখানো হবে।"
-  emoji: "স্বনির্ধারিত ইমোজিগুলি"
-  emojiDescription: "আপনি একটি কাস্টম ইমোজির নাম কোলনে আবদ্ধ করে কাস্টম ইমোজিটি দেখাতে পারেন৷"
-  search: "খুঁজুন"
-  searchDescription: "পূর্ব-টাইপ করা পাঠ্য সহ একটি অনুসন্ধান বাক্স প্রদর্শন করে।"
-  flip: "উল্টান"
-  flipDescription: "বিষয়বস্তু উপরে/নীচে বা বাম/ডানে উল্টান।"
-  jelly: "অ্যানিমেশন (জেলি)"
-  jellyDescription: "জেলির মত অ্যানিমেশন দেখায়।"
-  tada: "অ্যানিমেশন (টাডা)"
-  tadaDescription: "\"টাডা!\" এর মত অ্যানিমেশন দেখায়।"
-  jump: "অ্যানিমেশন (লাফ)"
-  jumpDescription: "বিষয়বস্তুতে লাফ মারার মত অ্যানিমেশন দেখায়।"
-  bounce: "অ্যানিমেশন (তিড়িং বিড়িং)"
-  bounceDescription: "তিড়িং বিড়িং করার মত অ্যানিমেশন দেখায়।"
-  shake: "অ্যানিমেশন (ঝাঁকি)"
-  shakeDescription: "ঝাঁকির মত অ্যানিমেশন দেখায়।"
-  twitch: "অ্যানিমেশন (মোচড়ানো)"
-  twitchDescription: "মোচড়ানোর মত অ্যানিমেশন দেখায়।"
-  spin: "অ্যানিমেশন (ঘুরা)"
-  spinDescription: "ঘুরার মত অ্যানিমেশন দেখায়।"
-  x2: "বড়"
-  x2Description: "বিষয়বস্তু বড় করে দেখায়।"
-  x3: "অনেক বড়"
-  x3Description: "বিষয়বস্তু আরও বড় করে দেখায়।"
-  x4: "অস্বাভাবিক বড়"
-  x4Description: "বিষয়বস্তুকে আগের থেকেও আরও বড় করে দেখায়।"
-  blur: "ব্লার"
-  blurDescription: "বিষয়বস্তুকে ব্লার করতে পারেন। আপনি এর উপর মাউস কার্সার রাখলে, এটি পরিষ্কারভাবে দেখতে পাবেন।"
-  font: "ফন্ট"
-  fontDescription: "বিষয়বস্তুকে কোন ফন্টে দেখানো হবে তা নির্ধারণ করে।"
-  rainbow: "রেইনবো"
-  rainbowDescription: "বিষয়বস্তুকে রংধনুর রং গুলিতে প্রদর্শন করে।"
-  sparkle: "চিক চিক"
-  sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
-  rotate: "ঘুরান"
-  rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
@@ -1138,8 +1063,6 @@ _tutorial:
   step7_3: "এখন Misskey উপভোগ করুন 🚀"
 _2fa:
   alreadyRegistered: "আপনি ইতিমধ্যে একটি 2-ফ্যাক্টর অথেনটিকেশন ডিভাইস নিবন্ধন করেছেন৷"
-  registerDevice: "নতুন ডিভাইস নিবন্ধন করুন"
-  registerKey: "সিকিউরিটি কী নিবন্ধন করুন"
   step1: "প্রথমে, আপনার ডিভাইসে {a} বা {b} এর মতো একটি অথেনটিকেশন অ্যাপ ইনস্টল করুন৷"
   step2: "এরপরে, অ্যাপের সাহায্যে প্রদর্শিত QR কোডটি স্ক্যান করুন।"
   step2Url: "ডেস্কটপ অ্যাপে, নিম্নলিখিত URL লিখুন:"
@@ -1191,7 +1114,6 @@ _antennaSources:
   homeTimeline: "আপনি অনুসরণ করছেন, এমন ব্যবহারকারীদের নোট"
   users: "এক বা একাধিক নির্দিষ্ট ব্যবহারকারীর নোট"
   userList: "নির্দিষ্ট তালিকায় নাম থাকা ব্যবহারকারীদের নোট"
-  userGroup: "নির্দিষ্ট গ্রুপে থাকা ব্যবহারকারীদের নোট"
 _weekday:
   sunday: "রবিবার"
   monday: "সোমবার"
@@ -1260,8 +1182,6 @@ _visibility:
   followersDescription: "শুধুমাত্র আপনার অনুসরণকারীদের নিকট পোস্ট করুন"
   specified: "ডাইরেক্ট নোট"
   specifiedDescription: "শুধুমাত্র নির্দিষ্ট ব্যাবহারকারীর নিকট পাঠান"
-  localOnly: "শুধুমাত্র লোকাল"
-  localOnlyDescription: "রিমোট ব্যাবহারকারীদের নিকট দৃশ্যমান নয়"
 _postForm:
   replyPlaceholder: "নোটটির জবাব দিন..."
   quotePlaceholder: "নোটটিকে উদ্ধৃত করুন..."
@@ -1389,12 +1309,9 @@ _notification:
   youGotReply: "{name} আপনাকে জবাব দিয়েছে"
   youGotQuote: "{name} আপনাকে উদ্ধৃত করেছে"
   youRenoted: "{name} এর Renote"
-  youGotMessagingMessageFromUser: "{name} আপনাকে মেসেজ করেছে"
-  youGotMessagingMessageFromGroup: "{name} গ্রুপে একটি নতুন মেসেজ আছে"
   youWereFollowed: "আপনাকে অনুসরণ করছে"
   youReceivedFollowRequest: "অনুসরণ করার জন্য অনুরোধ পাওয়া গেছে"
   yourFollowRequestAccepted: "আপনার অনুসরণ করার অনুরোধ গৃহীত হয়েছে"
-  youWereInvitedToGroup: "আপনি একটি গ্রুপে আমন্ত্রিত হয়েছেন"
   pollEnded: "পোলের ফলাফল দেখা যাবে"
   emptyPushNotificationMessage: "আপডেট করা পুশ বিজ্ঞপ্তি"
   _types:
@@ -1408,7 +1325,6 @@ _notification:
     pollEnded: "পোল শেষ"
     receiveFollowRequest: "প্রাপ্ত অনুসরণের অনুরোধসমূহ"
     followRequestAccepted: "গৃহীত অনুসরণের অনুরোধসমূহ"
-    groupInvited: "গ্রুপের আমন্ত্রনসমূহ"
     app: "লিঙ্ক করা অ্যাপ থেকে বিজ্ঞপ্তি"
   _actions:
     followBack: "ফলো ব্যাক করেছে"
@@ -1433,5 +1349,6 @@ _deck:
     tl: "টাইমলাইন"
     antenna: "অ্যান্টেনা"
     list: "লিস্ট"
+    channel: "চ্যানেলগুলি"
     mentions: "উল্লেখসমূহ"
     direct: "ডাইরেক্ট নোটগুলি"

locales/ca-ES.yml

@@ -108,6 +108,7 @@ clickToShow: "Fes clic per mostrar"
 sensitive: "NSFW"
 add: "Afegir"
 reaction: "Reaccions"
+reactions: "Reaccions"
 reactionSetting: "Reaccions a mostrar al selector de reaccions"
 reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem \"+\" per afegir."
 rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"
@@ -314,13 +315,10 @@ userList: "Llistes"
 about: "Informació"
 aboutMisskey: "Quant a Misskey"
 administrator: "Administrador/a"
-twoStepAuthentication: "Verificació en dos passos"
 moderator: "Moderador/a"
 moderation: "Moderació"
 nUsersMentioned: "{n} usuaris mencionats"
 securityKey: "Clau de seguretat"
-securityKeyName: "Nom de la clau"
-registerSecurityKey: "Registra la clau de seguretat"
 unregister: "Cancel·la el registre"
 passwordLessLogin: "Inici de sessió sense contrasenya"
 resetPassword: "Restableix la contrasenya"
@@ -333,7 +331,6 @@ help: "Ajuda"
 invites: "Convida"
 next: "Següent"
 noteOf: "Publicació de: {user}"
-inviteToGroup: "Convida'l al grup"
 invitations: "Convida"
 tags: "Etiquetes"
 docSource: "Font del document"
@@ -374,11 +371,6 @@ file: "Fitxers"
 _email:
   _follow:
     title: "t'ha seguit"
-_mfm:
-  mention: "Menció"
-  quote: "Citar"
-  emoji: "Emojis personalitzats"
-  search: "Cercar"
 _instanceMute:
   instanceMuteDescription: "Silencia tots els impulsos dels servidors seleccionats, també els usuaris que responen a altres d'un servidor silenciat."
 _theme:
@@ -397,7 +389,6 @@ _antennaSources:
   homeTimeline: "Publicacions dels usuaris seguits"
   users: "Publicacions d'usuaris específics"
   userList: "Publicacions d'una llista d'usuaris"
-  userGroup: "Publicacions d'usuaris d'un grup"
 _widgets:
   profile: "Perfil"
   instanceInfo: "Informació del fitxer d'instal·lació"

locales/cs-CZ.yml

@@ -105,6 +105,7 @@ clickToShow: "Klikněte pro zobrazení"
 sensitive: "NSFW"
 add: "Přidat"
 reaction: "Reakce"
+reactions: "Reakce"
 reactionSettingDescription2: "Přetažením změníte pořadí, kliknutím smažete, zmáčkněte \"+\" k přidání"
 rememberNoteVisibility: "Zapamatovat nastavení zobrazení poznámky"
 attachCancel: "Odstranit přílohu"
@@ -336,12 +337,9 @@ about: "Informace"
 aboutMisskey: "O Misskey"
 administrator: "Administrátor"
 token: "Token"
-twoStepAuthentication: "Dvoufaktorová autentikace"
 moderator: "Moderátor"
 nUsersMentioned: "{n} uživatelů zmínilo"
 securityKey: "Bezpečnostní klíč"
-securityKeyName: "Název klíče"
-registerSecurityKey: "Registrovat bezpečnostní klíč"
 lastUsed: "Naposledy použito"
 unregister: "Odstranit"
 resetPassword: "Resetovat heslo"
@@ -358,13 +356,7 @@ markAsReadAllTalkMessages: "Označit všechny zprávy za přečtené"
 help: "Nápověda"
 inputMessageHere: "Sem zadejte zprávu"
 close: "Zavřít"
-group: "Skupina"
-groups: "Skupiny"
-createGroup: "Vytvořit skupinu"
-ownedGroups: "Vlastněné skupiny"
-joinedGroups: "Členství ve skupinách"
 invites: "Pozvat"
-groupName: "Název skupiny"
 members: "Členové"
 transfer: "Převod"
 title: "Titulek"
@@ -373,7 +365,6 @@ enable: "Povolit"
 next: "Další"
 retype: "Zadejte znovu"
 noteOf: "{user} poznámky"
-inviteToGroup: "Pozvat do skupiny"
 quoteAttached: "Citace"
 quoteQuestion: "Přiložit jako citaci?"
 noMessagesYet: "Zatím tu nejsou žádné zprávy"
@@ -395,14 +386,10 @@ passwordMatched: "Hesla se schodují"
 passwordNotMatched: "Hesla se neschodují"
 signinWith: "Přihlásit se s {x}"
 signinFailed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
-tapSecurityKey: "Ťukněte na bezpečnostní klíč"
 or: "Nebo"
 language: "Jazyk"
 uiLanguage: "Jazyk uživatelského rozhraní"
-groupInvited: "Pozvat do skupiny"
 aboutX: "O {x}"
-youHaveNoGroups: "Nemáte žádné skupiny"
-joinOrCreateGroup: "Můžete požádat o pozvání do stávající skupiny nebo vytvořit novou."
 noHistory: "Žádná historie"
 signinHistory: "Historie přihlášení"
 category: "Kategorie"
@@ -612,6 +599,12 @@ fast: "Rychlá"
 account: "Účty"
 show: "Zobrazit"
 color: "Barva"
+_role:
+  priority: "Priorita"
+  _priority:
+    low: "Nízká"
+    middle: "Střední"
+    high: "Vysoká"
 _ad:
   back: "Zpět"
 _gallery:
@@ -635,19 +628,6 @@ _registry:
 _aboutMisskey:
   allContributors: "Všichni přispěvatelé"
   source: "Zdrojový kód"
-_mfm:
-  mention: "Zmínění"
-  hashtag: "Hashtag"
-  link: "Odkaz"
-  bold: "Tučně"
-  quote: "Citovat"
-  emoji: "Vlastní emoji"
-  search: "Vyhledávání"
-  flip: "Otočit"
-  tada: "Animace (tadá)"
-  blur: "Rozmazání"
-  font: "Font"
-  rainbow: "Duha"
 _channel:
   featured: "Trendy"
 _menuDisplay:
@@ -683,9 +663,6 @@ _time:
   second: "Sekund"
   minute: "Minut"
   hour: "Hodin"
-_2fa:
-  registerDevice: "Přidat zařízení"
-  registerKey: "Přidat bezpečnostní klíč"
 _weekday:
   sunday: "Neděle"
   monday: "Pondělí"
@@ -779,7 +756,6 @@ _pages:
     button: "Tlačítko"
 _notification:
   youWereFollowed: "Máte nového následovníka"
-  youWereInvitedToGroup: "Pozvat do skupiny"
   _types:
     all: "Vše"
     follow: "Sledovaní"
@@ -797,4 +773,5 @@ _deck:
     tl: "Časová osa"
     antenna: "Antény"
     list: "Seznamy"
+    channel: "Kanály"
     mentions: "Zmínění"

locales/de-DE.yml

@@ -68,7 +68,7 @@ export: "Export"
 files: "Dateien"
 download: "Herunterladen"
 driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Notizen mit dieser Datei werden ebenso verschwinden."
-unfollowConfirm: "Möchtest du {name} nicht mehr folgen?"
+unfollowConfirm: "Möchtest du {name} wirklich nicht mehr folgen?"
 exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
 importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch nehmen."
 lists: "Listen"
@@ -94,7 +94,7 @@ defaultNoteVisibility: "Standardsichtbarkeit"
 follow: "Folgen"
 followRequest: "Follow-Anfrage senden"
 followRequests: "Follow-Anfragen"
-unfollow: "Nicht mehr folgen"
+unfollow: "Entfolgen"
 followRequestPending: "Follow-Anfrage ausstehend"
 enterEmoji: "Gib ein Emoji ein"
 renote: "Renote"
@@ -103,6 +103,8 @@ renoted: "Renote getätigt."
 cantRenote: "Renote dieses Beitrags nicht möglich."
 cantReRenote: "Renote einer Renote nicht möglich."
 quote: "Zitieren"
+inChannelRenote: "Kanal-interner Renote"
+inChannelQuote: "Kanal-internes Zitat"
 pinnedNote: "Angeheftete Notiz"
 pinned: "Angeheftet"
 you: "Du"
@@ -110,6 +112,7 @@ clickToShow: "Zum Anzeigen anklicken"
 sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
+reactions: "Reaktionen"
 reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
@@ -128,6 +131,7 @@ unblockConfirm: "Möchtest du diese Blockierung wirklich aufheben?"
 suspendConfirm: "Möchtest du diesen Benutzer wirklich sperren?"
 unsuspendConfirm: "Möchtest du diesen Benutzer wirklich entsperren?"
 selectList: "Liste auswählen"
+selectChannel: "Kanal auswählen"
 selectAntenna: "Antenne auswählen"
 selectWidget: "Widget auswählen"
 editWidgets: "Widgets bearbeiten"
@@ -255,6 +259,8 @@ noMoreHistory: "Kein weiterer Verlauf vorhanden"
 startMessaging: "Neuen Chat erstellen"
 nUsersRead: "Von {n} Benutzern gelesen"
 agreeTo: "Ich stimme {0} zu"
+agreeBelow: "Ich stimme Untenstehendem zu"
+basicNotesBeforeCreateAccount: "Wichtige Infos"
 tos: "Nutzungsbedingungen"
 start: "Anfangen"
 home: "Startseite"
@@ -387,13 +393,10 @@ about: "Über"
 aboutMisskey: "Über Misskey"
 administrator: "Administrator"
 token: "Token"
-twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
 moderator: "Moderator"
 moderation: "Moderation"
 nUsersMentioned: "Von {n} Benutzern erwähnt"
 securityKey: "Sicherheitsschlüssel"
-securityKeyName: "Schlüsselname"
-registerSecurityKey: "Sicherheitsschlüssel registrieren"
 lastUsed: "Zuletzt benutzt"
 unregister: "Deaktivieren"
 passwordLessLogin: "Passwortloses Anmelden einrichten"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "Alle Chats als gelesen markieren"
 help: "Hilfe"
 inputMessageHere: "Hier Nachricht eingeben"
 close: "Schließen"
-group: "Gruppe"
-groups: "Gruppen"
-createGroup: "Gruppe erstellen"
-ownedGroups: "Meine Gruppen"
-joinedGroups: "Beigetretene Gruppen"
 invites: "Einladungen"
-groupName: "Gruppenname"
 members: "Mitglieder"
 transfer: "Übertragen"
-messagingWithUser: "Privatchat"
-messagingWithGroup: "Gruppenchat"
 title: "Titel"
 text: "Text"
 enable: "Aktivieren"
 next: "Weiter"
 retype: "Erneut eingeben"
 noteOf: "Notiz von {user}"
-inviteToGroup: "Zu Gruppe einladen"
 quoteAttached: "Zitat"
 quoteQuestion: "Als Zitat anhängen?"
 noMessagesYet: "Noch keine Nachrichten vorhanden"
@@ -450,20 +444,17 @@ passwordMatched: "Stimmt überein"
 passwordNotMatched: "Stimmt nicht überein"
 signinWith: "Mit {x} anmelden"
 signinFailed: "Anmeldung fehlgeschlagen. Überprüfe Benutzername und Passswort."
-tapSecurityKey: "Tippe deinen Sicherheitsschlüssel an"
 or: "Oder"
 language: "Sprache"
 uiLanguage: "Sprache der Benutzeroberfläche"
-groupInvited: "Du wurdest in eine Gruppe eingeladen"
 aboutX: "Über {x}"
 emojiStyle: "Emoji-Stil"
 native: "Nativ"
 disableDrawer: "Keine ausfahrbaren Menüs verwenden"
-youHaveNoGroups: "Keine Gruppen vorhanden"
-joinOrCreateGroup: "Lass dich zu einer Gruppe einladen oder erstelle deine eigene."
 noHistory: "Kein Verlauf gefunden"
 signinHistory: "Anmeldungsverlauf"
-disableAnimatedMfm: "MFM, die Animationen enthalten, deaktivieren"
+enableAdvancedMfm: "Erweitertes MFM aktivieren"
+enableAnimatedMfm: "Animiertes MFM aktivieren"
 doing: "In Bearbeitung …"
 category: "Kategorie"
 tags: "Schlagwörter"
@@ -833,8 +824,6 @@ deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzde
 incorrectPassword: "Falsches Passwort."
 voteConfirm: "Wirklich für „{choice}“ abstimmen?"
 hide: "Inhalt verbergen"
-leaveGroup: "Gruppe verlassen"
-leaveGroupConfirm: "Möchtest du „{name}“ wirklich verlassen?"
 useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
 welcomeBackWithName: "Willkommen zurück, {name}"
 clickToFinishEmailVerification: "Drücke bitte auf [{ok}], um die Email-Bestätigung abzuschließen."
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgef
 rateLimitExceeded: "Versuchsanzahl überschritten"
 cropImage: "Bild zuschneiden"
 cropImageAsk: "Möchtest du das Bild zuschneiden?"
+cropYes: "Zuschneiden"
+cropNo: "Unbearbeitet verwenden"
 file: "Datei"
 recentNHours: "Letzten {n} Stunden"
 recentNDays: "Letzten {n} Tage"
@@ -931,26 +922,319 @@ undefined: "Undefiniert"
 assign: "Zuweisen"
 unassign: "Entfernen"
 color: "Farbe"
+manageCustomEmojis: "Kann benutzerdefinierte Emojis 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."
+preset: "Vorlage"
+selectFromPresets: "Aus Vorlagen wählen"
+achievements: "Errungenschaften"
+gotInvalidResponseError: "Ungültige Antwort des Servers"
+gotInvalidResponseErrorDescription: "Eventuell ist der Server momentan nicht erreichbar oder untergeht Wartungsarbeiten. Bitte versuche es später noch einmal."
+thisPostMayBeAnnoying: "Dieser Beitrag stört eventuell andere Benutzer."
+thisPostMayBeAnnoyingHome: "Zur Startseite schicken"
+thisPostMayBeAnnoyingCancel: "Abbrechen"
+thisPostMayBeAnnoyingIgnore: "Trotzdem schicken"
+collapseRenotes: "Bereits gesehene Renotes verkürzt anzeigen"
+internalServerError: "Serverinterner Fehler"
+internalServerErrorDescription: "Im Server ist ein unerwarteter Fehler aufgetreten."
+copyErrorInfo: "Fehlerdetails kopieren"
+_achievements:
+  earnedAt: "Freigeschaltet am"
+  _types:
+    _notes1:
+      title: "Hallo Misskey!"
+      description: "Sende deine erste Notiz"
+      flavor: "Hab eine schöne Zeit mit Misskey!"
+    _notes10:
+      title: "Ein paar Notizen"
+      description: "10 Notizen gesendet"
+    _notes100:
+      title: "Viele Notizen"
+      description: "100 Notizen gesendet"
+    _notes500:
+      title: "Überschüttet mit Notizen"
+      description: "500 Notizen gesendet"
+    _notes1000:
+      title: "Berg an Notizen"
+      description: "1.000 Notizen gesendet"
+    _notes5000:
+      title: "Überquellende Notizen"
+      description: "5.000 Notizen gesendet"
+    _notes10000:
+      title: "Supernotiz"
+      description: "10.000 Notizen gesendet"
+    _notes20000:
+      title: "Brauche... mehr... Notizen"
+      description: "20.000 Notizen gesendet"
+    _notes30000:
+      title: "Notizen, Notizen, Notizen"
+      description: "30.000 Notizen gesendet"
+    _notes40000:
+      title: "Notizfabrik"
+      description: "40.000 Notizen gesendet"
+    _notes50000:
+      title: "Planet der Notizen"
+      description: "50.000 Notizen gesendet"
+    _notes60000:
+      title: "Notizquasar"
+      description: "60.000 Notizen gesendet"
+    _notes70000:
+      title: "Schwarzes Notizloch"
+      description: "70.000 Notizen gesendet"
+    _notes80000:
+      title: "Notizgalaxie"
+      description: "80.000 Notizen gesendet"
+    _notes90000:
+      title: "Notizversum"
+      description: "90.000 Notizen gesendet"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "100.000 Notizen gesendet"
+      flavor: "Du hast wirklich viel zu sagen."
+    _login3:
+      title: "Anfänger Ⅰ"
+      description: "An 3 Tagen eingeloggt"
+      flavor: "Nenn' mich ab heute Misskist"
+    _login7:
+      title: "Anfänger Ⅱ"
+      description: "An 7 Tagen eingeloggt"
+      flavor: "Na, eingewöht?"
+    _login15:
+      title: "Anfänger Ⅲ"
+      description: "An 15 Tagen eingeloggt"
+    _login30:
+      title: "Misskist Ⅰ"
+      description: "An 30 Tagen eingeloggt"
+    _login60:
+      title: "Misskist Ⅱ"
+      description: "An 60 Tagen eingeloggt"
+    _login100:
+      title: "Misskist Ⅲ"
+      description: "An 100 Tagen eingeloggt"
+      flavor: "Violent Misskist"
+    _login200:
+      title: "Stammbesucher Ⅰ"
+      description: "An 200 Tagen eingeloggt"
+    _login300:
+      title: "Stammbesucher Ⅱ"
+      description: "An 300 Tagen eingeloggt"
+    _login400:
+      title: "Stammbesucher Ⅲ"
+      description: "An 400 Tagen eingeloggt"
+    _login500:
+      title: "Veteran Ⅰ"
+      description: "An 500 Tagen eingeloggt"
+      flavor: "Meine Kameraden, ich liebe sie, die Notizen."
+    _login600:
+      title: "Veteran Ⅱ"
+      description: "An 600 Tagen eingeloggt"
+    _login700:
+      title: "Veteran Ⅲ"
+      description: "An 700 Tagen eingeloggt"
+    _login800:
+      title: "Meister der Notizen Ⅰ"
+      description: "An 800 Tagen eingeloggt"
+    _login900:
+      title: "Meister der Notizen Ⅱ"
+      description: "An 900 Tagen eingeloggt"
+    _login1000:
+      title: "Meister der Notizen Ⅲ"
+      description: "An 1000 Tagen eingeloggt"
+      flavor: "Danke, dass du Misskey nutzt!"
+    _noteClipped1:
+      title: "Muss... clippen..."
+      description: "Die erste Notiz geclippt"
+    _noteFavorited1:
+      title: "Sternengucker"
+      description: "Eine Notiz als Favorit markiert"
+    _myNoteFavorited1:
+      title: "Sternensucher"
+      description: "Ein anderer Benutzer hat eine deiner Notizen als Favoriten markiert"
+    _profileFilled:
+      title: "Perfekte Vorbereitung"
+      description: "Fülle dein Profil aus"
+    _markedAsCat:
+      title: "Ich der Kater"
+      description: "Markiere dein Konto als Katze"
+      flavor: "Einen Namen bekommst du später. "
+    _following1:
+      title: "Das Folgen beginnt"
+      description: "Du folgst deiner ersten Person"
+    _following10:
+      title: "Folge ihnen... folge ihnen..."
+      description: "Du folgst über 10 Leuten"
+    _following50:
+      title: "Viele Freunde"
+      description: "Du folgst über 50 Leuten"
+    _following100:
+      title: "100 Freunde"
+      description: "Du folgst über 100 Leuten"
+    _following300:
+      title: "Freundeüberschuss"
+      description: "Du folgst über 300 Leuten"
+    _followers1:
+      title: "Der erste Follower"
+      description: "Du hast deinen ersten Follower erhalten"
+    _followers10:
+      title: "Mir nach!"
+      description: "Die Anzahl deiner Follower hat 10 überschritten"
+    _followers50:
+      title: "Wirrwarr"
+      description: "Die Anzahl deiner Follower hat 50 überschritten"
+    _followers100:
+      title: "Beliebt"
+      description: "Die Anzahl deiner Follower hat 100 überschritten"
+    _followers300:
+      title: "Stellt euch bitte in einer Reihe auf"
+      description: "Die Anzahl deiner Follower hat 300 überschritten"
+    _followers500:
+      title: "Funkmast"
+      description: "Die Anzahl deiner Follower hat 500 überschritten"
+    _followers1000:
+      title: "Influencer"
+      description: "Die Anzahl deiner Follower hat 1000 überschritten"
+    _collectAchievements30:
+      title: "Sammler der Errungenschaften"
+      description: "Schalte 30 Errungenschaften frei"
+    _viewAchievements3min:
+      title: "Fan von Errungenschaften"
+      description: "Schau dir die Liste deiner Errungenschaften für mindestens 3 Minuten an"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Sende \"I ❤ #Misskey\""
+      flavor: "Danke, dass du Misskey verwendest! - vom Entwicklerteam"
+    _foundTreasure:
+      title: "Schatzsuche"
+      description: "Du hast einen verborgenen Schatz gefunden"
+    _client30min:
+      title: "Kurze Pause"
+      description: "Habe Misskey für 30 Minuten geöffnet"
+    _noteDeletedWithin1min:
+      title: "Ups"
+      description: "Lösche eine Notiz innerhalb von 1 Minute nachdem sie gesendet wurde"
+    _postedAtLateNight:
+      title: "Nachtaktiv"
+      description: "Sende mitten in der Nacht eine Notiz"
+      flavor: "Geh bald schlafen."
+    _postedAt0min0sec:
+      title: "Zeitansage"
+      description: "Sende um 00:00 eine Notiz"
+      flavor: "Klick Klick Klick Dooong"
+    _selfQuote:
+      title: "Selbstzitat"
+      description: "Zitiere eine eigene Notiz"
+    _htl20npm:
+      title: "Fließende Chronik"
+      description: "Deine Startseitenchronik erreicht eine Geschwindigkeit von 20 npm (Notizen pro Minute)"
+    _viewInstanceChart:
+      title: "Analyst"
+      description: "Schau dir die Messwerte der Instanz an"
+    _outputHelloWorldOnScratchpad:
+      title: "Hallo Welt!"
+      description: "Gib \"hello world\" in der Testumgebung aus"
+    _open3windows:
+      title: "Splitscreen"
+      description: "Habe zur gleichen Zeit mindestens 3 Fenster offen"
+    _driveFolderCircularReference:
+      title: "Zyklischer Verweis"
+      description: "Versuche, in Drive einen Zirkelbezug von Ordnern herzustellen"
+    _reactWithoutRead:
+      title: "Hast du das wirklich gelesen?"
+      description: "Reagiere auf eine Notiz mit mindestens 100 Zeichen innerhalb von 3 Sekunden der Erstellung der Notiz"
+    _clickedClickHere:
+      title: "Klicke hier"
+      description: "Du hast hier geklickt"
+    _justPlainLucky:
+      title: "Pures Glück"
+      description: "Kann alle 10 Sekunden mit einer Warscheinlichkeit von 0.01% erhalten werden"
+    _setNameToSyuilo:
+      title: "Gottkomplex"
+      description: "Setze deinen Namen auf \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "Einjahresjubiläum"
+      description: "Seit der Erstellung deines Kontos ist 1 Jahr vergangen"
+    _passedSinceAccountCreated2:
+      title: "Zweijahresjubiläum"
+      description: "Seit der Erstellung deines Kontos sind 2 Jahre vergangen"
+    _passedSinceAccountCreated3:
+      title: "Dreijahresjubiläum"
+      description: "Seit der Erstellung deines Kontos sind 3 Jahre vergangen"
+    _loggedInOnBirthday:
+      title: "Alles Gute Zum Geburtstag"
+      description: "Logge dich an deinem Geburtstag ein"
+    _loggedInOnNewYearsDay:
+      title: "Frohes Neujahr"
+      description: "Logge dich am Neujahrstag ein"
+      flavor: "Auf ein weiteres tolles Jahr in dieser Instanz"
+    _cookieClicked:
+      title: "Ein Spiel, in dem du auf einen Keks klickst"
+      description: "Den Keks geklickt"
+      flavor: "Bist du hier richtig?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Sende den Link zu Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "Rolle erstellen"
   edit: "Rolle bearbeiten"
   name: "Rollenname"
   description: "Rollenbeschreibung"
   permission: "Rollenberechtigungen"
+  descriptionOfPermission: "<b>Moderatoren</b> können grundlegende Verwaltungsaufgaben erledigen.\n<b>Administratoren</b> können alle Einstellungen der Instanz verwalten."
+  assignTarget: "Zuweisungsart"
+  descriptionOfAssignTarget: "<b>Manuell</b> bedeutet, dass die Liste der Benutzer einer Rolle manuell verwaltet wird.\n<b>Konditional</b> bedeutet, dass die Liste der Benutzer einer Rolle durch eine Bedingung automatisch verwaltet wird."
+  manual: "Manuell"
+  conditional: "Konditional"
+  condition: "Bedingung"
+  isConditionalRole: "Dies ist eine konditionale Rolle."
   isPublic: "Öffentliche Rolle"
   descriptionOfIsPublic: "Ist dies aktiviert, so kann jeder die Liste der Benutzer, die dieser Rolle zugewiesen sind, einsehen. Zusätzlich wird diese Rolle im Profil zugewiesener Benutzer angezeigt."
   options: "Optionen"
+  policies: "Richtlinien"
   baseRole: "Rollenvorlage"
   useBaseValue: "Wert der Rollenvorlage verwenden"
   chooseRoleToAssign: "Zuzuweisende Rolle auswählen"
+  iconUrl: "Icon-URL"
+  asBadge: "Als Abzeichen anzeigen"
+  descriptionOfAsBadge: "Ist dies aktiviert, so wird das Icon dieser Rolle an der Seite der Namen von Benutzern mit dieser Rolle angezeigt."
   canEditMembersByModerator: "Moderatoren können Benutzern diese Rolle zuweisen"
   descriptionOfCanEditMembersByModerator: "Wenn aktiviert, so können Moderatoren und Adminstratoren anderen Benutzern diese Rolle zuweisen bzw. diese Zuweisung aufheben. Wenn deaktiviert, so ist es nur Administratoren möglich, Zuweisungen dieser Rolle zu verwalten."
+  priority: "Priorität"
+  _priority:
+    low: "Niedrig"
+    middle: "Mittel"
+    high: "Hoch"
   _options:
     gtlAvailable: "Kann auf die globale Chronik zugreifen"
     ltlAvailable: "Kann auf die lokale Chronik zugreifen"
     canPublicNote: "Kann öffentliche Notizen erstellen"
+    canInvite: "Kann Einladungscodes für diese Instanz erstellen"
+    canManageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
     driveCapacity: "Drive-Kapazität"
+    pinMax: "Maximale Anzahl an angehefteten Notizen"
     antennaMax: "Maximale Anzahl an Antennen"
+    wordMuteMax: "Maximale Zeichenlänge für Wortstummschaltungen"
+    webhookMax: "Maximale Anzahl an Webhooks"
+    clipMax: "Maximale Anzahl an Clips"
+    noteEachClipsMax: "Maximale Anzahl an Notizen innerhalb eines Clips"
+    userListMax: "Maximale Anzahl an Benutzern in einer Benutzerliste"
+    userEachUserListsMax: "Maximale Anzahl an Benutzerlisten"
+    rateLimitFactor: "Versuchsanzahl"
+    descriptionOfRateLimitFactor: "Je niedriger desto weniger restriktiv, je höher destro restriktiver."
+    canHideAds: "Kann Werbung ausblenden"
+  _condition:
+    isLocal: "Lokaler Benutzer"
+    isRemote: "Benutzer fremder Instanz"
+    createdLessThan: "Kontoerstellung liegt weniger als X zurück"
+    createdMoreThan: "Kontoerstellung liegt mehr als X zurück"
+    followersLessThanOrEq: "Hat X oder weniger Follower"
+    followersMoreThanOrEq: "Hat X oder mehr Follower"
+    followingLessThanOrEq: "Folgt X oder weniger Benutzern"
+    followingMoreThanOrEq: "Folgt X oder mehr Benutzern"
+    and: "UND-Bedingung"
+    or: "ODER-Bedingung"
+    not: "NICHT-Bedingung"
 _sensitiveMediaDetection:
   description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht."
   sensitivity: "Erkennungssensitivität"
@@ -983,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
+  hide: "Ausblenden"
 _forgotPassword:
   enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
@@ -1038,72 +1323,6 @@ _nsfw:
   respect: "Als NSFW markierte Bilder verbergen"
   ignore: "Als NSFW markierte Bilder nicht verbergen"
   force: "Alle Medien verbergen"
-_mfm:
-  cheatSheet: "MFM Spickzettel"
-  intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
-  dummy: "Misskey erweitert die Welt des Fediverse"
-  mention: "Erwähnung"
-  mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer angegeben werden."
-  hashtag: "Hashtag"
-  hashtagDescription: "Mit einer Raute und Text kann ein Hashtag angegeben werden."
-  url: "URL"
-  urlDescription: "Zeigt URLs an."
-  link: "Link"
-  linkDescription: "Zeigt spezifische Textabschnitte als URL an."
-  bold: "Fett"
-  boldDescription: "Zeichen zur Betonung dicker erscheinen lassen."
-  small: "Klein"
-  smallDescription: "Inhalt klein und dünn erscheinen lassen."
-  center: "Zentrieren"
-  centerDescription: "Inhalt zentriert anzeigen."
-  inlineCode: "Code (Eingebettet)"
-  inlineCodeDescription: "Syntax-Hervorhebung für (Programm-)Code eingebettet anzeigen."
-  blockCode: "Code (Block)"
-  blockCodeDescription: "Syntax-Hervorhebung für mehrzeiligen (Programm-)Code als Block anzeigen."
-  inlineMath: "Mathe (Eingebettet)"
-  inlineMathDescription: "Mathematische Formeln (KaTeX) eingebettet anzeigen."
-  blockMath: "Mathe (Block)"
-  blockMathDescription: "Mehrzeilige mathematische Formeln (KaTeX) als Block einbetten."
-  quote: "Zitationen"
-  quoteDescription: "Inhalt als Zitat anzeigen."
-  emoji: "Benutzerdefinierte Emojis"
-  emojiDescription: "Durch das Umschließen von Emoji-Namen durch Doppelpunkte können benutzerdefinierte Emojis angezeigt werden."
-  search: "Suche"
-  searchDescription: "Eine vorgefertige Suchanfragebox anzeigen."
-  flip: "Spiegelung"
-  flipDescription: "Inhalt horizontal oder vertikal gespiegelt anzeigen."
-  jelly: "Animation (Dehnen)"
-  jellyDescription: "Verleiht Inhalt eine sich dehnende Animation."
-  tada: "Animation (Tada)"
-  tadaDescription: "Verleiht Inhalt eine Animation mit \"Tada!\"-Gefühl"
-  jump: "Animation (Sprung)"
-  jumpDescription: "Verleiht Inhalt eine springende Animation."
-  bounce: "Animation (Federn)"
-  bounceDescription: "Verleiht Inhalt eine federnde Animation."
-  shake: "Animation (Zittern)"
-  shakeDescription: "Verleiht Inhalt eine zitternde Animation."
-  twitch: "Animation (Zucken)"
-  twitchDescription: "Verleiht Inhalt eine sehr stark zuckende Animation."
-  spin: "Animation (Rotieren)"
-  spinDescription: "Verleiht Inhalt eine rotierende Animation."
-  x2: "Groß"
-  x2Description: "Inhalte größer anzeigen."
-  x3: "Sehr groß"
-  x3Description: "Inhalte noch größer anzeigen."
-  x4: "Unglaublich groß"
-  x4Description: "Lässt Inhalte noch größer als größer als groß angezeigt werden."
-  blur: "Weichzeichnen"
-  blurDescription: "Inhalte durch Weihzeichnung verschwimmen lassen. Durch das Bewegen des Mauszeigers über den Inhalt wird er klar angezeigt."
-  font: "Schriftart"
-  fontDescription: "Setzt die Schriftart des Inhaltes fest."
-  rainbow: "Regenbogen"
-  rainbowDescription: "Lässt den Inhalt in Regenbogenfarben erscheinen."
-  sparkle: "Glitzer"
-  sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
-  rotate: "Drehen"
-  rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel."
-  plain: "Schlicht"
-  plainDescription: "Deaktiviert jegliche MFM-Syntax, die sich innerhalb dieses MFM-Effekts befindet."
 _instanceTicker:
   none: "Nie anzeigen"
   remote: "Für Benutzer fremder Instanzen anzeigen"
@@ -1266,14 +1485,14 @@ _tutorial:
   step8_3: "Diese Einstellung kannst du jederzeit ändern."
 _2fa:
   alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert."
-  registerDevice: "Neues Gerät registrieren"
-  registerKey: "Neuen Sicherheitsschlüssel registrieren"
   step1: "Installiere zuerst eine Authentifizierungsapp (z.B. {a} oder {b}) auf deinem Gerät."
   step2: "Dann, scanne den angezeigten QR-Code mit deinem Gerät."
   step2Url: "Nutzt du ein Desktopprogramm kannst du alternativ diese URL eingeben:"
   step3: "Gib zum Abschluss den Token ein, der von deiner App angezeigt wird."
   step4: "Alle folgenden Anmeldungsversuche werden ab sofort die Eingabe eines solchen Tokens benötigen."
   securityKeyInfo: "Du kannst neben Fingerabdruck- oder PIN-Authentifizierung auf deinem Gerät auch Anmeldung mit Hilfe eines FIDO2-kompatiblen Hardware-Sicherheitsschlüssels einrichten."
+  removeKeyConfirm: "Das Backup {name} löschen?"
+  renewTOTPCancel: "Nein, danke"
 _permissions:
   "read:account": "Deine Benutzerkontoinformationen lesen"
   "write:account": "Deine Benutzerkontoinformationen bearbeiten"
@@ -1308,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge lesen"
   "write:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge bearbeiten"
 _auth:
+  shareAccessTitle: "Verteilung von App-Berechtigungen"
   shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
   shareAccessAsk: "Bist du dir sicher, dass du diese Anwendung authorisieren möchtest, auf dein Benutzerkonto zugreifen zu können?"
+  permission: "{name} fordert folgende Berechtigungen"
   permissionAsk: "Diese Anwendung fordert folgende Berechtigungen"
   pleaseGoBack: "Bitte kehre zur Anwendung zurück"
   callback: "Es wird zur Anwendung zurückgekehrt"
   denied: "Zugriff verweigert"
+  pleaseLogin: "Bitte logge dich ein, um Apps zu authorisieren."
 _antennaSources:
   all: "Alle Notizen"
   homeTimeline: "Notizen von Benutzern, denen gefolgt wird"
   users: "Notizen von einem oder mehreren angegebenen Benutzern"
   userList: "Notizen von allen Benutzern einer Liste"
-  userGroup: "Notizen von allen Benutzern einer Gruppe"
 _weekday:
   sunday: "Sonntag"
   monday: "Montag"
@@ -1394,8 +1615,6 @@ _visibility:
   followersDescription: "Nur für Follower sichtbar"
   specified: "Direkt"
   specifiedDescription: "Nur für bestimmte Benutzer sichtbar"
-  localOnly: "Nur Lokal"
-  localOnlyDescription: "Unsichtbar für Benutzer anderer Instanzen"
 _postForm:
   replyPlaceholder: "Dieser Notiz antworten …"
   quotePlaceholder: "Diese Notiz zitieren …"
@@ -1533,15 +1752,13 @@ _notification:
   youGotReply: "{name} hat dir geantwortet"
   youGotQuote: "{name} hat dich zitiert"
   youRenoted: "Renote deiner Notiz von {name}"
-  youGotMessagingMessageFromUser: "{name} hat dir eine Chatnachricht gesendet"
-  youGotMessagingMessageFromGroup: "In die Gruppe {name} wurde eine Chatnachricht gesendet"
   youWereFollowed: "ist dir gefolgt"
   youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten"
   yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert"
-  youWereInvitedToGroup: "{userName} hat dich in eine Gruppe eingeladen"
   pollEnded: "Umfrageergebnisse sind verfügbar"
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Push-Benachrichtigungen wurden aktualisiert"
+  achievementEarned: "Errungenschaft freigeschaltet"
   _types:
     all: "Alle"
     follow: "Neue Follower"
@@ -1553,7 +1770,6 @@ _notification:
     pollEnded: "Ende von Umfragen"
     receiveFollowRequest: "Erhaltene Follow-Anfragen"
     followRequestAccepted: "Akzeptierte Follow-Anfragen"
-    groupInvited: "Erhaltene Gruppeneinladungen"
     app: "Benachrichtigungen von Apps"
   _actions:
     followBack: "folgt dir nun auch"
@@ -1583,5 +1799,6 @@ _deck:
     tl: "Chronik"
     antenna: "Antennen"
     list: "Listen"
+    channel: "Kanal"
     mentions: "Erwähnungen"
     direct: "Direktnachrichten"

locales/el-GR.yml

@@ -103,6 +103,7 @@ you: "Εσύ"
 clickToShow: "Κάντε κλικ για εμφάνιση"
 add: "Προσθέστε"
 reaction: "Αντιδράσεις"
+reactions: "Αντιδράσεις"
 reactionSetting: "Αντιδράσεις για εμφάνιση στην επιλογή αντίδρασης"
 reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε, πατήστε \"+\" για να προσθέσετε."
 rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας σημειώματος"
@@ -229,21 +230,13 @@ moderator: "Συντονιστής"
 moderation: "Συντονισμός"
 cacheClear: "Εκκαθάριση προσωρινής μνήμης"
 markAsReadAllNotifications: "Όλες οι ειδοποιήσεις διαβάστηκαν"
-group: "Ομάδα"
-groups: "Ομάδες"
-createGroup: "Δημιουργία ομάδας"
-ownedGroups: "Οι ομάδες σας"
-groupName: "Όνομα ομάδας"
 members: "Μέλη"
 transfer: "Μεταφορά"
-messagingWithUser: "Ιδιωτική συνομιλία"
-messagingWithGroup: "Ομαδική συνομιλία"
 title: "Τίτλος"
 text: "Κείμενο"
 enable: "Ενεργοποίηση"
 next: "Επόμενο"
 noteOf: "Σημείωμα από {user}"
-inviteToGroup: "Πρόσκληση στην ομάδα"
 quoteAttached: "Παράθεση"
 signinRequired: "Παρακαλούμε δημιουργήστε λογαριασμό ή συνδεθείτε πριν συνεχίσετε"
 category: "Κατηγορία"
@@ -297,11 +290,6 @@ cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω
 _email:
   _follow:
     title: "Έχετε ένα νέο ακόλουθο"
-_mfm:
-  mention: "Επισήμανση"
-  quote: "Παράθεση"
-  emoji: "Επιπλέον emoji"
-  search: "Αναζήτηση"
 _channel:
   featured: "Δημοφιλή"
 _theme:
@@ -341,7 +329,6 @@ _antennaSources:
   homeTimeline: "Σημειώματα από μέλη που ακολουθείτε"
   users: "Σημειώματα από συγκεκριμένα μέλη"
   userList: "Σημειώματα από καθορισμένη λίστα μελών"
-  userGroup: "Σημειώματα από μέλη καθορισμένης ομάδας"
 _widgets:
   profile: "Προφίλ"
   instanceInfo: "Πληροφορίες του instance"
@@ -386,7 +373,6 @@ _pages:
   blocks:
     image: "Εικόνες"
 _notification:
-  youGotMessagingMessageFromUser: "{name} σάς έστειλε ένα μήνυμα συνομιλίας"
   youWereFollowed: "σε ακολούθησε"
   _types:
     follow: "Νέοι ακόλουθοι"

locales/en-US.yml

@@ -68,7 +68,7 @@ export: "Export"
 files: "Files"
 download: "Download"
 driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? Notes with this file attached will also be deleted."
-unfollowConfirm: "Are you sure that you want to unfollow {name}?"
+unfollowConfirm: "Are you sure you want to unfollow {name}?"
 exportRequested: "You've requested an export. This may take a while. It will be added to your Drive once completed."
 importRequested: "You've requested an import. This may take a while."
 lists: "Lists"
@@ -103,6 +103,8 @@ renoted: "Renoted."
 cantRenote: "This post can't be renoted."
 cantReRenote: "A renote can't be renoted."
 quote: "Quote"
+inChannelRenote: "Channel-only Renote"
+inChannelQuote: "Channel-only Quote"
 pinnedNote: "Pinned note"
 pinned: "Pin to profile"
 you: "You"
@@ -110,6 +112,7 @@ clickToShow: "Click to show"
 sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
+reactions: "Reactions"
 reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember note visibility settings"
@@ -128,6 +131,7 @@ unblockConfirm: "Are you sure that you want to unblock this account?"
 suspendConfirm: "Are you sure that you want to suspend this account?"
 unsuspendConfirm: "Are you sure that you want to unsuspend this account?"
 selectList: "Select a list"
+selectChannel: "Select a channel"
 selectAntenna: "Select an antenna"
 selectWidget: "Select a widget"
 editWidgets: "Edit widgets"
@@ -255,6 +259,8 @@ noMoreHistory: "There is no further history"
 startMessaging: "Start a new chat"
 nUsersRead: "read by {n}"
 agreeTo: "I agree to {0}"
+agreeBelow: "I agree to the below"
+basicNotesBeforeCreateAccount: "Important notes"
 tos: "Terms of Service"
 start: "Begin"
 home: "Home"
@@ -387,13 +393,10 @@ about: "About"
 aboutMisskey: "About Misskey"
 administrator: "Administrator"
 token: "Token"
-twoStepAuthentication: "Two-factor authentication"
 moderator: "Moderator"
 moderation: "Moderation"
 nUsersMentioned: "Mentioned by {n} users"
 securityKey: "Security key"
-securityKeyName: "Key name"
-registerSecurityKey: "Register a security key"
 lastUsed: "Last used"
 unregister: "Unregister"
 passwordLessLogin: "Password-less login"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "Mark all messages as read"
 help: "Help"
 inputMessageHere: "Enter message here"
 close: "Close"
-group: "Group"
-groups: "Groups"
-createGroup: "Create a group"
-ownedGroups: "Owned Groups"
-joinedGroups: "Joined groups"
 invites: "Invites"
-groupName: "Group name"
 members: "Members"
 transfer: "Transfer"
-messagingWithUser: "Private chat"
-messagingWithGroup: "Group chat"
 title: "Title"
 text: "Text"
 enable: "Enable"
 next: "Next"
 retype: "Enter again"
 noteOf: "Note by {user}"
-inviteToGroup: "Invite to group"
 quoteAttached: "Quote"
 quoteQuestion: "Append as quote?"
 noMessagesYet: "No messages yet"
@@ -450,20 +444,17 @@ passwordMatched: "Matches"
 passwordNotMatched: "Does not match"
 signinWith: "Sign in with {x}"
 signinFailed: "Unable to sign in. The entered username or password is incorrect."
-tapSecurityKey: "Tap your security key"
 or: "Or"
 language: "Language"
 uiLanguage: "User interface language"
-groupInvited: "You've been invited to a group"
 aboutX: "About {x}"
 emojiStyle: "Emoji style"
 native: "Native"
 disableDrawer: "Don't use drawer-style menus"
-youHaveNoGroups: "You have no groups"
-joinOrCreateGroup: "Get invited to a group or create your own."
 noHistory: "No history available"
 signinHistory: "Login history"
-disableAnimatedMfm: "Disable MFM with animation"
+enableAdvancedMfm: "Enable advanced MFM"
+enableAnimatedMfm: "Enable animated MFM"
 doing: "Processing..."
 category: "Category"
 tags: "Tags"
@@ -833,8 +824,6 @@ deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
 incorrectPassword: "Incorrect password."
 voteConfirm: "Confirm your vote for \"{choice}\"?"
 hide: "Hide"
-leaveGroup: "Leave group"
-leaveGroupConfirm: "Are you sure you want to leave \"{name}\"?"
 useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"
 welcomeBackWithName: "Welcome back, {name}"
 clickToFinishEmailVerification: "Please click [{ok}] to complete email verification."
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "Could not fetch account information"
 rateLimitExceeded: "Rate limit exceeded"
 cropImage: "Crop image"
 cropImageAsk: "Do you want to crop this image?"
+cropYes: "Crop"
+cropNo: "Use as-is"
 file: "File"
 recentNHours: "Last {n} hours"
 recentNDays: "Last {n} days"
@@ -931,26 +922,319 @@ undefined: "Undefined"
 assign: "Assign"
 unassign: "Unassign"
 color: "Color"
+manageCustomEmojis: "Manage Custom Emojis"
+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."
+preset: "Preset"
+selectFromPresets: "Choose from presets"
+achievements: "Achievements"
+gotInvalidResponseError: "Invalid server response"
+gotInvalidResponseErrorDescription: "The server may be unreachable or undergoing maintenance. Please try again later."
+thisPostMayBeAnnoying: "This note may annoy others."
+thisPostMayBeAnnoyingHome: "Post to home timeline"
+thisPostMayBeAnnoyingCancel: "Cancel"
+thisPostMayBeAnnoyingIgnore: "Post anyway"
+collapseRenotes: "Collapse renotes you've already seen"
+internalServerError: "Internal Server Error"
+internalServerErrorDescription: "The server has run into an unexpected error."
+copyErrorInfo: "Copy error details"
+_achievements:
+  earnedAt: "Unlocked at"
+  _types:
+    _notes1:
+      title: "just setting up my msky"
+      description: "Post your first note"
+      flavor: "Have a good time with Misskey!"
+    _notes10:
+      title: "Some notes"
+      description: "Post 10 notes"
+    _notes100:
+      title: "A lot of notes"
+      description: "Post 100 notes"
+    _notes500:
+      title: "Covered in notes"
+      description: "Post 500 notes"
+    _notes1000:
+      title: "A mountain of notes"
+      description: "Post 1,000 notes"
+    _notes5000:
+      title: "Overflowing notes"
+      description: "Post 5,000 notes"
+    _notes10000:
+      title: "Supernote"
+      description: "Post 10,000 notes"
+    _notes20000:
+      title: "Need... more... notes..."
+      description: "Post 20,000 notes"
+    _notes30000:
+      title: "Notes notes notes!"
+      description: "Post 30,000 notes"
+    _notes40000:
+      title: "Note factory"
+      description: "Post 40,000 notes"
+    _notes50000:
+      title: "Planet of notes"
+      description: "Post 50,000 notes"
+    _notes60000:
+      title: "Note quasar"
+      description: "Post 60,000 notes"
+    _notes70000:
+      title: "Note black hole"
+      description: "Post 70,000 notes"
+    _notes80000:
+      title: "Note galaxy"
+      description: "Post 80,000 notes"
+    _notes90000:
+      title: "Note universe"
+      description: "Post 90,000 notes"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Post 100,000 notes"
+      flavor: "You sure have a lot to say."
+    _login3:
+      title: "Beginner I"
+      description: "Log in for a total of 3 days"
+      flavor: "Starting today, just call me Misskist"
+    _login7:
+      title: "Beginner II"
+      description: "Log in for a total of 7 days"
+      flavor: "Feel like you've gotten the hang of things yet?"
+    _login15:
+      title: "Beginner III"
+      description: "Log in for a total of 15 days"
+    _login30:
+      title: "Misskist I"
+      description: "Log in for a total of 30 days"
+    _login60:
+      title: "Misskist II"
+      description: "Log in for a total of 60 days"
+    _login100:
+      title: "Misskist III"
+      description: "Log in for a total of 100 days"
+      flavor: "Violent Misskist"
+    _login200:
+      title: "Regular I"
+      description: "Log in for a total of 200 days"
+    _login300:
+      title: "Regular II"
+      description: "Log in for a total of 300 days"
+    _login400:
+      title: "Regular III"
+      description: "Log in for a total of 400 days"
+    _login500:
+      title: "Expert I"
+      description: "Log in for a total of 500 days"
+      flavor: "My friends, it has often been said that I like notes"
+    _login600:
+      title: "Expert II"
+      description: "Log in for a total of 600 days"
+    _login700:
+      title: "Expert III"
+      description: "Log in for a total of 700 days"
+    _login800:
+      title: "Master of Notes I"
+      description: "Log in for a total of 800 days"
+    _login900:
+      title: "Master of Notes II"
+      description: "Log in for a total of 900 days"
+    _login1000:
+      title: "Master of Notes III"
+      description: "Log in for a total of 1,000 days"
+      flavor: "Thank you for using Misskey!"
+    _noteClipped1:
+      title: "Must... clip..."
+      description: "Clip your first note"
+    _noteFavorited1:
+      title: "Stargazer"
+      description: "Favorite your first note"
+    _myNoteFavorited1:
+      title: "Seeking Stars"
+      description: "Have somebody else favorite one of your notes"
+    _profileFilled:
+      title: "Well-prepared"
+      description: "Set up your profile"
+    _markedAsCat:
+      title: "I Am a Cat"
+      description: "Mark your account as a cat"
+      flavor: "I'll give you a name later."
+    _following1:
+      title: "Following your first user"
+      description: "Follow a user"
+    _following10:
+      title: "Keep up... keep up..."
+      description: "Follow 10 users"
+    _following50:
+      title: "Lots of friends"
+      description: "Follow 50 accounts"
+    _following100:
+      title: "100 Friends"
+      description: "Follow 100 accounts"
+    _following300:
+      title: "Friend overload"
+      description: "Follow 300 accounts"
+    _followers1:
+      title: "First follower"
+      description: "Gain 1 follower"
+    _followers10:
+      title: "Follow me!"
+      description: "Gain 10 followers"
+    _followers50:
+      title: "Coming in crowds"
+      description: "Gain 50 followers"
+    _followers100:
+      title: "Popular"
+      description: "Gain 100 followers"
+    _followers300:
+      title: "Please form a single line"
+      description: "Gain 300 followers"
+    _followers500:
+      title: "Radio Tower"
+      description: "Gain 500 followers"
+    _followers1000:
+      title: "Influencer"
+      description: "Gain 1,000 followers"
+    _collectAchievements30:
+      title: "Achievement Collector"
+      description: "Earn 30 achievements"
+    _viewAchievements3min:
+      title: "Likes Achievements"
+      description: "Look at your list of achievements for at least 3 minutes"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Post \"I ❤ #Misskey\""
+      flavor: "Misskey's development team greatly appreciates your support!"
+    _foundTreasure:
+      title: "Treasure Hunt"
+      description: "You've found the hidden treasure"
+    _client30min:
+      title: "Short break"
+      description: "Spend 30 minutes on Misskey"
+    _noteDeletedWithin1min:
+      title: "Nevermind"
+      description: "Delete a note within a minute of posting it"
+    _postedAtLateNight:
+      title: "Nocturnal"
+      description: "Post a note late at night"
+      flavor: "It's about time to go to bed."
+    _postedAt0min0sec:
+      title: "Speaking Clock"
+      description: "Post a note at 00:00"
+      flavor: "Click Click Click Claaang"
+    _selfQuote:
+      title: "Self-Reference"
+      description: "Quote your own note"
+    _htl20npm:
+      title: "Flowing Timeline"
+      description: "Have the speed of your home timeline exceed 20 npm (notes per minute)"
+    _viewInstanceChart:
+      title: "Analyst"
+      description: "View your instance's charts"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "Output \"hello world\" in the Scratchpad"
+    _open3windows:
+      title: "Multi-Window"
+      description: "Have at least 3 windows open at the same time"
+    _driveFolderCircularReference:
+      title: "Circular Reference"
+      description: "Attempt to create a recursively nested folder in Drive"
+    _reactWithoutRead:
+      title: "Did you really read that?"
+      description: "React on a note that's over 100 characters long within 3 seconds of it being posted"
+    _clickedClickHere:
+      title: "Click here"
+      description: "You've clicked here"
+    _justPlainLucky:
+      title: "Just Plain Lucky"
+      description: "Has a chance to be obtained with a probability of 0.005% every 10 seconds"
+    _setNameToSyuilo:
+      title: "God Complex"
+      description: "Set your name to \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "One Year Anniversary"
+      description: "One year has passed since your account was created"
+    _passedSinceAccountCreated2:
+      title: "Two Year Anniversary"
+      description: "Two years have passed since your account was created"
+    _passedSinceAccountCreated3:
+      title: "Three Year Anniversary"
+      description: "Three years have passed since your account was created"
+    _loggedInOnBirthday:
+      title: "Happy Birthday"
+      description: "Log in on your birthday"
+    _loggedInOnNewYearsDay:
+      title: "Happy New Year!"
+      description: "Logged in on the first day of the year"
+      flavor: "To another great year on this instance"
+    _cookieClicked:
+      title: "A game in which you click cookies"
+      description: "Clicked the cookie"
+      flavor: "Wait, are you on the correct website?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Post the link to Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "New role"
   edit: "Edit role"
   name: "Role name"
   description: "Role description"
   permission: "Role permissions"
+  descriptionOfPermission: "<b>Moderators</b> can perform basic moderation operations.\n<b>Administrators</b> can change all settings of the instance."
+  assignTarget: "Assignment type"
+  descriptionOfAssignTarget: "<b>Manual</b> to manually change who is part of this role and who is not.\n<b>Conditional</b> to have users be automatically assigned and removed from this role based on a condition."
+  manual: "Manual"
+  conditional: "Conditional"
+  condition: "Condition"
+  isConditionalRole: "This is a conditional role."
   isPublic: "Public role"
   descriptionOfIsPublic: "Anyone will be able to view a list of users assigned to this role. In addition, this role will be displayed in the profiles of assigned users."
   options: "Role options"
-  baseRole: "Base role"
-  useBaseValue: "Use base role value"
+  policies: "Policies"
+  baseRole: "Role template"
+  useBaseValue: "Use role template value"
   chooseRoleToAssign: "Select the role to assign"
-  canEditMembersByModerator: "Allow moderators to edit the list members of this role"
+  iconUrl: "Icon URL"
+  asBadge: "Show as badge"
+  descriptionOfAsBadge: "This role's icon will be displayed next to the username of users with this role if turned on."
+  canEditMembersByModerator: "Allow moderators to edit the list of members for this role"
   descriptionOfCanEditMembersByModerator: "When turned on, moderators as well as administrators will be able to assign and unassign users to this role. When turned off, only administrators will be able to assign users."
+  priority: "Priority"
+  _priority:
+    low: "Low"
+    middle: "Medium"
+    high: "High"
   _options:
-    gtlAvailable: "Viewing the global timeline"
-    ltlAvailable: "Viewing the local timeline"
+    gtlAvailable: "Can view the global timeline"
+    ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
+    canInvite: "Can create instance invite codes"
+    canManageCustomEmojis: "Can manage custom emojis"
     driveCapacity: "Drive capacity"
+    pinMax: "Maximum number of pinned notes"
     antennaMax: "Maximum number of antennas"
+    wordMuteMax: "Maximum number of characters allowed in word mutes"
+    webhookMax: "Maximum number of Webhooks"
+    clipMax: "Maximum number of Clips"
+    noteEachClipsMax: "Maximum number of notes within a clip"
+    userListMax: "Maximum number of user lists"
+    userEachUserListsMax: "Maximum number of users within a user list"
+    rateLimitFactor: "Rate limit"
+    descriptionOfRateLimitFactor: "Lower rate limits are less restrictive, higher ones more restrictive. "
+    canHideAds: "Can hide ads"
+  _condition:
+    isLocal: "Local user"
+    isRemote: "Remote user"
+    createdLessThan: "Less than X has passed since account creation"
+    createdMoreThan: "More than X has passed since account creation"
+    followersLessThanOrEq: "Has X or fewer followers"
+    followersMoreThanOrEq: "Has X or more followers"
+    followingLessThanOrEq: "Follows X or fewer accounts"
+    followingMoreThanOrEq: "Follows X or more accounts"
+    and: "AND-Condition"
+    or: "OR-Condition"
+    not: "NOT-Condition"
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
   sensitivity: "Detection sensitivity"
@@ -983,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
+  hide: "Hide"
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1038,72 +1323,6 @@ _nsfw:
   respect: "Hide NSFW media"
   ignore: "Don't hide NSFW media"
   force: "Hide all media"
-_mfm:
-  cheatSheet: "MFM Cheatsheet"
-  intro: "MFM is a Misskey-exclusive markup language that can be used in many places. Here you can view a list of all available MFM syntax."
-  dummy: "Misskey expands the world of the Fediverse"
-  mention: "Mention"
-  mentionDescription: "You can specify a user by using an At-Symbol and a username."
-  hashtag: "Hashtag"
-  hashtagDescription: "You can specify a hashtag using a number sign and text."
-  url: "URL"
-  urlDescription: "URLs can be displayed."
-  link: "Link"
-  linkDescription: "Specific parts of text can be displayed as a URL."
-  bold: "Bold"
-  boldDescription: "Highlights letters by making them thicker."
-  small: "Small"
-  smallDescription: "Displays content small and thin."
-  center: "Center"
-  centerDescription: "Displays content centered."
-  inlineCode: "Code (Inline)"
-  inlineCodeDescription: "Displays inline syntax highlighting for (program) code."
-  blockCode: "Code (Block)"
-  blockCodeDescription: "Displays syntax highlighting for multi-line (program) code in a block."
-  inlineMath: "Math (Inline)"
-  inlineMathDescription: "Display math formulas (KaTeX) in-line"
-  blockMath: "Math (Block)"
-  blockMathDescription: "Display multi-line math formulas (KaTeX) in a block"
-  quote: "Quote"
-  quoteDescription: "Displays content as a quote."
-  emoji: "Custom Emoji"
-  emojiDescription: "By surrounding a custom emoji name with colons, custom emoji can be displayed."
-  search: "Search"
-  searchDescription: "Displays a search box with pre-entered text."
-  flip: "Flip"
-  flipDescription: "Flips content horizontally or vertically."
-  jelly: "Animation (Jelly)"
-  jellyDescription: "Gives content a jelly-like animation."
-  tada: "Animation (Tada)"
-  tadaDescription: "Gives content a \"Tada!\"-like animation."
-  jump: "Animation (Jump)"
-  jumpDescription: "Gives content a jumping animation."
-  bounce: "Animation (Bounce)"
-  bounceDescription: "Gives content a bouncy animation."
-  shake: "Animation (Shake)"
-  shakeDescription: "Gives content a shaking animation."
-  twitch: "Animation (Twitch)"
-  twitchDescription: "Gives content a strongly twitching animation."
-  spin: "Animation (Spin)"
-  spinDescription: "Gives content a spinning animation."
-  x2: "Big"
-  x2Description: "Displays content bigger."
-  x3: "Very big"
-  x3Description: "Displays content even bigger."
-  x4: "Unbelievably big"
-  x4Description: "Displays content even bigger than bigger than big."
-  blur: "Blur"
-  blurDescription: "Blurs content. It will be displayed clearly when hovered over."
-  font: "Font"
-  fontDescription: "Sets the font to display content in."
-  rainbow: "Rainbow"
-  rainbowDescription: "Makes the content appear in rainbow colors."
-  sparkle: "Sparkle"
-  sparkleDescription: "Gives content a sparkling particle effect."
-  rotate: "Rotate"
-  rotateDescription: "Turns content by a specified angle."
-  plain: "Plain"
-  plainDescription: "Deactivates the effects of all MFM contained within this MFM effect."
 _instanceTicker:
   none: "Never show"
   remote: "Show for remote users"
@@ -1266,14 +1485,14 @@ _tutorial:
   step8_3: "You can always change this setting later."
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
-  registerDevice: "Register a new device"
-  registerKey: "Register a security key"
   step1: "First, install an authentication app (such as {a} or {b}) on your device."
   step2: "Then, scan the QR code displayed on this screen."
   step2Url: "You can also enter this URL if you're using a desktop program:"
   step3: "Enter the token provided by your app to finish setup."
   step4: "From now on, any future login attempts will ask for such a login token."
   securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your account."
+  removeKeyConfirm: "Delete the {name} backup?"
+  renewTOTPCancel: "Not now"
 _permissions:
   "read:account": "View your account information"
   "write:account": "Edit your account information"
@@ -1308,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "View your list of liked gallery posts"
   "write:gallery-likes": "Edit your list of liked gallery posts"
 _auth:
+  shareAccessTitle: "Granting application permissions"
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
   shareAccessAsk: "Are you sure you want to authorize this application to access your account?"
+  permission: "{name} requests the following permissions"
   permissionAsk: "This application requests the following permissions"
   pleaseGoBack: "Please go back to the application"
   callback: "Returning to the application"
   denied: "Access denied"
+  pleaseLogin: "Please log in to authorize applications."
 _antennaSources:
   all: "All notes"
   homeTimeline: "Notes from followed users"
   users: "Notes from specific users"
   userList: "Notes from a specified list of users"
-  userGroup: "Notes from users in a specified group"
 _weekday:
   sunday: "Sunday"
   monday: "Monday"
@@ -1394,8 +1615,6 @@ _visibility:
   followersDescription: "Make visible to your followers only"
   specified: "Direct"
   specifiedDescription: "Make visible for specified users only"
-  localOnly: "Local only"
-  localOnlyDescription: "Not visible to remote users"
 _postForm:
   replyPlaceholder: "Reply to this note..."
   quotePlaceholder: "Quote this note..."
@@ -1533,15 +1752,13 @@ _notification:
   youGotReply: "{name} replied to you"
   youGotQuote: "{name} quoted you"
   youRenoted: "Renote from {name}"
-  youGotMessagingMessageFromUser: "{name} sent you a chat message"
-  youGotMessagingMessageFromGroup: "A chat message was sent to the {name} group"
   youWereFollowed: "followed you"
   youReceivedFollowRequest: "You've received a follow request"
   yourFollowRequestAccepted: "Your follow request was accepted"
-  youWereInvitedToGroup: "{userName} invited you to a group"
   pollEnded: "Poll results have become available"
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Push notifications have been updated"
+  achievementEarned: "Achievement unlocked"
   _types:
     all: "All"
     follow: "New followers"
@@ -1553,7 +1770,6 @@ _notification:
     pollEnded: "Polls ending"
     receiveFollowRequest: "Received follow requests"
     followRequestAccepted: "Accepted follow requests"
-    groupInvited: "Group invitations"
     app: "Notifications from linked apps"
   _actions:
     followBack: "followed you back"
@@ -1583,5 +1799,6 @@ _deck:
     tl: "Timeline"
     antenna: "Antennas"
     list: "List"
+    channel: "Channel"
     mentions: "Mentions"
     direct: "Direct notes"

locales/es-ES.yml

@@ -56,7 +56,7 @@ reply: "Responder"
 loadMore: "Ver más"
 showMore: "Ver más"
 showLess: "Cerrar"
-youGotNewFollower: "te ha seguido"
+youGotNewFollower: "ahora te sigue"
 receiveFollowRequest: "Recibiste una solicitud de seguimiento"
 followRequestAccepted: "La solicitud de seguimiento fue aceptada"
 mention: "Menciones"
@@ -110,6 +110,7 @@ clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
+reactions: "Reacción"
 reactionSetting: "Reacciones para mostrar en el menú de reacciones"
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
@@ -128,6 +129,7 @@ unblockConfirm: "¿Quiere dejar de bloquear esta cuenta?"
 suspendConfirm: "¿Quiere suspender esta cuenta?"
 unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?"
 selectList: "Seleccione una lista"
+selectChannel: "Seleccionar canal"
 selectAntenna: "Seleccionar antena"
 selectWidget: "Seleccionar widget"
 editWidgets: "Editar widgets"
@@ -255,6 +257,8 @@ noMoreHistory: "El historial se ha acabado"
 startMessaging: "Iniciar chat"
 nUsersRead: "Leído por {n} personas"
 agreeTo: "De acuerdo con {0}"
+agreeBelow: "Estoy de acuerdo con lo siguiente"
+basicNotesBeforeCreateAccount: "Notas básicas"
 tos: "Términos de uso"
 start: "Comenzar"
 home: "Inicio"
@@ -387,13 +391,10 @@ about: "Información"
 aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Token"
-twoStepAuthentication: "Autenticación de dos factores"
 moderator: "Moderador"
 moderation: "Moderación"
 nUsersMentioned: "{n} usuarios mencionados"
 securityKey: "Clave de seguridad"
-securityKeyName: "Nombre de la Clave"
-registerSecurityKey: "Registrar clave de seguridad"
 lastUsed: "Última vez usado"
 unregister: "Cancelar registro"
 passwordLessLogin: "Iniciar sesión sin contraseña"
@@ -411,24 +412,15 @@ markAsReadAllTalkMessages: "Marcar todos los chats como leídos"
 help: "Ayuda"
 inputMessageHere: "Escribe el mensaje aquí"
 close: "Cerrar"
-group: "Grupo"
-groups: "Grupos"
-createGroup: "Crear grupo"
-ownedGroups: "Tus"
-joinedGroups: "Grupos a los que me uní"
 invites: "Invitar"
-groupName: "Nombre del grupo"
 members: "Miembros"
 transfer: "Transferir"
-messagingWithUser: "Chatear con usuario"
-messagingWithGroup: "Chatear en grupo"
 title: "Título"
 text: "Texto"
 enable: "Activar"
 next: "Siguiente"
 retype: "Intentar de nuevo"
 noteOf: "Notas de {user}"
-inviteToGroup: "Invitar al grupo"
 quoteAttached: "Cita añadida"
 quoteQuestion: "¿Quiere añadir una cita?"
 noMessagesYet: "Aún no hay chat"
@@ -450,20 +442,15 @@ passwordMatched: "Correcto"
 passwordNotMatched: "Las contraseñas no son las mismas"
 signinWith: "Inicie sesión con {x}"
 signinFailed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario y contraseña correctos."
-tapSecurityKey: "Toque la clave de seguridad"
 or: "O"
 language: "Idioma"
 uiLanguage: "Idioma de visualización de la interfaz"
-groupInvited: "Invitado al grupo"
 aboutX: "Acerca de {x}"
 emojiStyle: "Estilo de emoji"
 native: "Nativo"
 disableDrawer: "No mostrar los menús en cajones"
-youHaveNoGroups: "Sin grupos"
-joinOrCreateGroup: "Obtenga una invitación para unirse al grupos o puede crear su propio grupo."
 noHistory: "No hay datos en el historial"
 signinHistory: "Historial de ingresos"
-disableAnimatedMfm: "Deshabilitar MFM que tiene animaciones"
 doing: "Voy en camino"
 category: "Categoría"
 tags: "Etiqueta"
@@ -508,7 +495,7 @@ objectStorageSetPublicRead: "Seleccionar \"public-read\" al subir "
 serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
 showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
-newNoteRecived: "Tienes una nota nuevo"
+newNoteRecived: "Tienes una nota nueva"
 sounds: "Sonidos"
 sound: "Sonidos"
 listen: "Escuchar"
@@ -833,8 +820,6 @@ deleteAccountConfirm: "La cuenta será borrada. ¿Está seguro?"
 incorrectPassword: "La contraseña es incorrecta"
 voteConfirm: "¿Confirma su voto a {choice}?"
 hide: "Ocultar"
-leaveGroup: "Dejar el grupo"
-leaveGroupConfirm: "¿Desea salir de {name}?"
 useDrawerReactionPickerForMobile: "Mostrar panel de reacciones en móviles"
 welcomeBackWithName: "Bienvenido otra vez, {name}"
 clickToFinishEmailVerification: "Cliquée {ok} y verifique su correo"
@@ -917,11 +902,328 @@ tools: "Utilidades"
 cannotLoad: "No se puede cargar."
 numberOfProfileView: "Número de vistas de perfil"
 like: "¡Muy bien!"
+unlike: "Quitar 'me gusta'"
+numberOfLikes: "Cantidad de 'Me gusta'"
 show: "Apariencia"
+neverShow: "No mostrar de nuevo"
+remindMeLater: "Recordar después"
+didYouLikeMisskey: "¿Te gusta Misskey?"
+pleaseDonate: "Misskey es software libre, y es usado por {host} . Por favor, ¡considera donar al proyecto principal para que podamos continuar!"
+roles: "Roles"
+role: "Roles"
+normalUser: "Usuario normal"
+undefined: "Indefinido"
+assign: "Asignar"
+unassign: "Quitar"
 color: "Color"
+manageCustomEmojis: "Administrar emojis personalizados"
+youCannotCreateAnymore: "Se alcanzó el límite de creación"
+cannotPerformTemporary: "Indisponible temporalmente"
+cannotPerformTemporaryDescription: "Esta acción no se puede realizar porque se excedió el límite de ejecución. Espera un poco y prueba de nuevo."
+preset: "Predefinido"
+selectFromPresets: "Escoger desde predefinidos"
+achievements: "Logros"
+gotInvalidResponseError: "Respuesta del servidor inválida"
+gotInvalidResponseErrorDescription: "Puede que el servidor esté caído o en mantenimiento. Favor de intentar más tarde"
+_achievements:
+  earnedAt: "Desbloqueado el"
+  _types:
+    _notes1:
+      title: "¡Hola Misskey!"
+      description: "Publicaste tu primera nota"
+      flavor: "¡Pasándola bien con Misskey!"
+    _notes10:
+      title: "Algunas notas"
+      description: "10 notas publicadas"
+    _notes100:
+      title: "¡Muchas notas!"
+      description: "100 notas publicadas"
+    _notes500:
+      title: "¡Cubierto de notas!"
+      description: "500 notas publicadas"
+    _notes1000:
+      title: "¡Una montaña de notas!"
+      description: "1000 notas publicadas"
+    _notes5000:
+      title: "¡Exceso de notas!"
+      description: "5000 notas publicadas"
+    _notes10000:
+      title: "¡Súpernota!"
+      description: "10000 notas publicadas"
+    _notes20000:
+      title: "Necesito... Más... ¡Notas!"
+      description: "20000 notas publicadas"
+    _notes30000:
+      title: "¡Notas! ¡Notas! ¡Notas!"
+      description: "30000 notas publicadas"
+    _notes40000:
+      title: "Fábrica de notas"
+      description: "40000 notas publicadas"
+    _notes50000:
+      title: "¡Un planeta de notas!"
+      description: "50000 notas publicadas"
+    _notes60000:
+      title: "¡Un cuásar de notas!"
+      description: "60000 notas publicadas"
+    _notes70000:
+      title: "¡Un hoyo negro de notas!"
+      description: "70000 notas publicadas"
+    _notes80000:
+      title: "¡Una galaxia de notas!"
+      description: "80000 notas publicadas"
+    _notes90000:
+      title: "¡Todo un universo de notas!"
+      description: "90000 notas publicadas"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "100000 notas publicadas"
+      flavor: "¿Tienes tanto para publicar?"
+    _login3:
+      title: "Principiante I"
+      description: "Días desde el inicio de sesión: 3"
+      flavor: "Desde hoy, soy Misskero"
+    _login7:
+      title: "Principiante II"
+      description: "Días desde el inicio de sesión: 7"
+      flavor: "¿Ya te acostumbraste?"
+    _login15:
+      title: "Principiante III"
+      description: "Días desde el inicio de sesión: 15"
+    _login30:
+      title: "Misskero I"
+      description: "Días desde el inicio de sesión: 30"
+    _login60:
+      title: "Misskero II"
+      description: "Días desde el inicio de sesión: 60"
+    _login100:
+      title: "Misskero III"
+      description: "Días desde el inicio de sesión: 100"
+      flavor: "Para este usuario, Misskaína"
+    _login200:
+      title: "Regular I"
+      description: "Días desde el inicio de sesión: 200"
+    _login300:
+      title: "Regular II"
+      description: "Días desde el inicio de sesión: 300"
+    _login400:
+      title: "Regular III"
+      description: "Días desde el inicio de sesión: 400"
+    _login500:
+      title: "Veterano I"
+      description: "Días desde el inicio de sesión: 500"
+      flavor: "Chicos, me encantan las libretas..."
+    _login600:
+      title: "Veterano II"
+      description: "Días desde el inicio de sesión: 600"
+    _login700:
+      title: "Veterano III"
+      description: "Días desde el inicio de sesión: 700"
+    _login800:
+      title: "Maestro I"
+      description: "Días desde el inicio de sesión: 800"
+    _login900:
+      title: "Maestro II"
+      description: "Días desde el inicio de sesión: 900"
+    _login1000:
+      title: "Maestro III"
+      description: "Días desde el inicio de sesión: 1000"
+      flavor: "¡Gracias por usar Misskey!"
+    _noteClipped1:
+      title: "No puedo evitar clipearte..."
+      description: "Hacer un clip por primera vez"
+    _noteFavorited1:
+      title: "Contemplando las estrellas"
+      description: "Poner una nota como favorito por primera vez"
+    _myNoteFavorited1:
+      title: "¡Quiero una estrella!"
+      description: "Tu nota ha sido marcada como favorito por primera vez"
+    _profileFilled:
+      title: "¡Listo!"
+      description: "Perfil completado"
+    _markedAsCat:
+      title: "Soy un gato"
+      description: "Configurar la cuenta como cuenta de un gato"
+      flavor: "Aún no tengo nombre"
+    _following1:
+      title: "Primera vez siguiendo a alguien"
+      description: "Seguir a un usuario"
+    _following10:
+      title: "Ahí la llevas, ahí la llevas..."
+      description: "10 usuarios seguidos"
+    _following50:
+      title: "¡Un puñado de amigos!"
+      description: "50 cuentas seguidas"
+    _following100:
+      title: "100 amigos"
+      description: "100 cuentas seguidas"
+    _following300:
+      title: "¡Sobrecarga de amigos!"
+      description: "300 cuentas seguidas"
+    _followers1:
+      title: "¡Tu primer seguidor!"
+      description: "1 seguidor ganado"
+    _followers10:
+      title: "¡Sígueme!"
+      description: "10 seguidores ganados"
+    _followers50:
+      title: "Viniendo en manada"
+      description: "50 seguidores ganados"
+    _followers100:
+      title: "Popular"
+      description: "100 cuentas seguidas"
+    _followers300:
+      title: "Por favor, hagan una fila"
+      description: "300 seguidores ganados"
+    _followers500:
+      title: "¡Toda una torre de radio!"
+      description: "500 seguidores ganados"
+    _followers1000:
+      title: "\"Influyente\""
+      description: "1000 seguidores gandos"
+    _collectAchievements30:
+      title: "Coleccionista"
+      description: "30 logros ganados"
+    _viewAchievements3min:
+      title: "¡Te gustan los logros!"
+      description: "Mirando tus logros por 3 minutos"
+    _iLoveMisskey:
+      title: "¡AMO Misskey!"
+      description: "\"I ❤ #Misskey\" Publicado"
+      flavor: "El equipo de desarrollo de Misskey, en verdad, ¡aprecia tu apoyo!"
+    _foundTreasure:
+      title: "Búsqueda del tesoro"
+      description: "Encontraste un tesoro"
+    _client30min:
+      title: "Un descansito"
+      description: "30 minutos dedicados a Misskey"
+    _noteDeletedWithin1min:
+      title: "Ah... Mejor no..."
+      description: "Borrar una nota antes que de pase 1 minuto"
+    _postedAtLateNight:
+      title: "Nocturno"
+      description: "Una nota publicada por la noche"
+      flavor: "¡Ya casi es hora de dormir!"
+    _postedAt0min0sec:
+      title: "Reloj parlante"
+      description: "Publicar una nota a las 00:00 de la madrugada"
+      flavor: "Tic, tic, tic ¡TUUUUUN!"
+    _selfQuote:
+      title: "Autoreferencia"
+      description: "Citar tu propia nota"
+    _htl20npm:
+      title: "Línea de tiempo fluyendo"
+      description: "La velocidad de tu línea de tiempo excede las 20 npm (notas por minuto)"
+    _viewInstanceChart:
+      title: "Analista"
+      description: "Gráficas de la instancia mostradas"
+    _outputHelloWorldOnScratchpad:
+      title: "¡Hola mundo!"
+      description: "Escribir \"hello world\" en el compositor"
+    _open3windows:
+      title: "Multiventana"
+      description: "Tener más de 3 ventanas al mismo tiempo"
+    _driveFolderCircularReference:
+      title: "Referencia circular"
+      description: "Intento de crear carpetas recursivamente"
+    _reactWithoutRead:
+      title: "¡Sí lo leíste bien?"
+      description: "Reaccionar a los 3 segundos de publicación de una nota con más de 100 caracteres"
+    _clickedClickHere:
+      title: "Pícale aquí"
+      description: "Le picó ahí"
+    _justPlainLucky:
+      title: "Pura suerte"
+      description: "Obtenido con una probabilidad del 0.01% cada 10 segundos"
+    _setNameToSyuilo:
+      title: "Complejo de superioridad"
+      description: "Configurar el nombre como 'Syuilo'"
+    _passedSinceAccountCreated1:
+      title: "Primer aniversario"
+      description: "Pasó un año desde la creación de la cuenta"
+    _passedSinceAccountCreated2:
+      title: "Segundo aniversario"
+      description: "Pasaron dos años desde la creación de la cuenta"
+    _passedSinceAccountCreated3:
+      title: "Tercer aniversario"
+      description: "Pasaron tres años desde la creación de la cuenta"
+    _loggedInOnBirthday:
+      title: "¡Feliz cumpleaños!"
+      description: "En linea el día de tu cumpleaños"
+    _loggedInOnNewYearsDay:
+      title: "¡Feliz Año Nuevo!"
+      description: "En linea en año nuevo"
+      flavor: "¡Gracias por tu apoyo a la instancia durante todo este año!"
+    _cookieClicked:
+      title: "Un juego para picarle a una galleta"
+      description: "Picaste una galleta"
+      flavor: "¿Está mal este juego?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Publicaste un vínculo a \"Brain Diver\""
+      flavor: "Misskey-Misskey La-Tu-Ma"
+_role:
+  new: "Crear rol"
+  edit: "Editar rol"
+  name: "Nombre del rol"
+  description: "Descripción del rol"
+  permission: "Permisos del rol"
+  descriptionOfPermission: "<b>Moderador</b> Te permite ejecutar acciones básicas de moderación.\n<b>Administradores</b> puede cambiar todas las configuraciones de la instancia."
+  assignTarget: "Asignar objetivo"
+  descriptionOfAssignTarget: "<b>Manual</b> Para cambiar manualmente lo que se incluye en este rol.\n<b>Condicional</b> configura una condición, y los usuarios que cumplan la condición serán incluídos automáticamente."
+  manual: "manual"
+  conditional: "condicional"
+  condition: "condición"
+  isConditionalRole: "Esto es un rol condicional"
+  isPublic: "Publicar rol"
+  descriptionOfIsPublic: "Cualquiera puede ver los usuarios asignados a este rol. También, el perfil del usuario mostrará este rol."
+  options: "Opción"
+  policies: "Política"
+  baseRole: "Rol base"
+  useBaseValue: "Usar los valores del rol base"
+  chooseRoleToAssign: "Selecciona el rol para asignar"
+  iconUrl: "URL del ícono"
+  asBadge: "Mostrar como emblema"
+  descriptionOfAsBadge: "Este ícono de rol se mostrará a lado del nombre de usuario cuando este rol se encuentre activo."
+  canEditMembersByModerator: "Permitir a los moderadores editar los miembros"
+  descriptionOfCanEditMembersByModerator: "Si se activa, los moderadores, al igual que los administradores, serán capaces de asignar/quitar usuarios a éste rol. Si se desactiva, sólo los administradores podrán hacerlo."
+  priority: "Prioridad"
+  _priority:
+    low: "Baja"
+    middle: "Mediano"
+    high: "Alta"
+  _options:
+    gtlAvailable: "Explorar la línea de tiempo global"
+    ltlAvailable: "Explorar la línea de tiempo local"
+    canPublicNote: "Permitir la publicación"
+    canInvite: "Puede crear códigos de invitación"
+    canManageCustomEmojis: "Administrar emojis personalizados"
+    driveCapacity: "Capacidad de almacenamiento"
+    pinMax: "Máximo de notas fijadas"
+    antennaMax: "Máximo de antenas"
+    wordMuteMax: "Máximo de caracteres en palabras silenciadas"
+    webhookMax: "Máximo de Webhooks"
+    clipMax: "Máximo de clips"
+    noteEachClipsMax: "Máximo de notas con clip"
+    userListMax: "Máximo de listas de usuarios"
+    userEachUserListsMax: "Máximo de usuarios en una lista"
+    rateLimitFactor: "Limitador"
+    descriptionOfRateLimitFactor: "Límites más bajos son menos restrictivos, más altos menos restrictivos"
+    canHideAds: "Puede ocultar anuncios"
+  _condition:
+    isLocal: "Usuario local"
+    isRemote: "Usuario remoto"
+    createdLessThan: "Menos de X han pasado desde la creación de la cuenta"
+    createdMoreThan: "Más de X han pasado desde la creación de la cuenta"
+    followersLessThanOrEq: "Tiene X o menos seguidores"
+    followersMoreThanOrEq: "Tiene X o más seguidores"
+    followingLessThanOrEq: "Sigue X o menos cuentas"
+    followingMoreThanOrEq: "Sigue X o más cuentas"
+    and: "Condicional AND"
+    or: "Condicional OR"
+    not: "Condicional NOT"
 _sensitiveMediaDetection:
-  description: "Reduce el esfuerzo de la moderación el el servidor a través del reconocimiento automático de contenido NSFW usando 'Machine Learning'. Esto puede incrementar ligeramente la carga en el servidor."
-  sensitivity: "Sensibilidad de detección"
+  description: "Reduce el esfuerzo de la moderación en el servidor a través del reconocimiento automático de contenido NSFW usando 'Machine Learning'. Esto puede incrementar ligeramente la carga en el servidor."
+  sensitivity: "Sensibilidad de la detección"
   sensitivityDescription: "Reducir la sensibilidad puede acarrear a varios falsos positivos, mientras que incrementarla puede reducir las detecciones (falsos negativos)."
   setSensitiveFlagAutomatically: "Marcar como NSFW"
   setSensitiveFlagAutomaticallyDescription: "Los resultados de la detección interna pueden ser retenidos incluso si la opción está desactivada."
@@ -951,6 +1253,7 @@ _accountDelete:
 _ad:
   back: "Deseleccionar"
   reduceFrequencyOfThisAd: "Mostrar menos este anuncio."
+  hide: "No mostrar"
 _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."
@@ -1006,72 +1309,6 @@ _nsfw:
   respect: "Ocultar medios NSFW"
   ignore: "No esconder medios NSFW "
   force: "Ocultar todos los medios"
-_mfm:
-  cheatSheet: "Hoja de referencia de MFM"
-  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
-  dummy: "Misskey expande el mundo de la Fediverso"
-  mention: "Menciones"
-  mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
-  hashtag: "Hashtag"
-  hashtagDescription: "Puede especificar un hashtag con un numeral y el texto."
-  url: "URL"
-  urlDescription: "Se pueden mostrar las URL"
-  link: "Vínculo"
-  linkDescription: "Se pueden asociar partes de texto a la URL"
-  bold: "Negrita"
-  boldDescription: "Muestra el texto con las letras más gruesas"
-  small: "Pequeño"
-  smallDescription: "Muestra el texto más pequeño y delgado"
-  center: "Centrar"
-  centerDescription: "Muestra el texto centrado"
-  inlineCode: "Código (insertado)"
-  inlineCodeDescription: "Muestra el código de un programa resaltando su sintaxis"
-  blockCode: "Código (bloque)"
-  blockCodeDescription: "Código de resaltado de sintaxis, como programas de varias líneas con bloques."
-  inlineMath: "Fórmula (insertado)"
-  inlineMathDescription: "Muestra fórmulas (KaTeX) insertadas"
-  blockMath: "Fórmula (bloque)"
-  blockMathDescription: "Muestra fórmulas (KaTeX) de varias líneas en un bloque"
-  quote: "Citar"
-  quoteDescription: "Muestra el contenido como una cita"
-  emoji: "Emojis personalizados"
-  emojiDescription: "Muestra los emojis personalizados encerrados entre dos puntos."
-  search: "Buscar"
-  searchDescription: "Muestra una caja de búsqueda con texto pre-escrito"
-  flip: "Echar de un capirotazo"
-  flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
-  jelly: "Animación (gelatina)"
-  jellyDescription: "Aplica un efecto de animación tipo gelatina"
-  tada: "Animación (tadá)"
-  tadaDescription: "Aplica un efecto de animación al estilo \"Tadá\""
-  jump: "Animación (saltar)"
-  jumpDescription: "Aplica un efecto de animación tipo salto"
-  bounce: "Animación (rebotar)"
-  bounceDescription: "Aplica un efecto de animación tipo rebote"
-  shake: "Animación (temblor)"
-  shakeDescription: "Aplica un efecto de animación tipo temblor"
-  twitch: "Animación (sacudida)"
-  twitchDescription: "Aplica un efecto de animación tipo sacudida"
-  spin: "Animación (giro)"
-  spinDescription: "Aplica un efecto de animación tipo rotación"
-  x2: "Grande"
-  x2Description: "Muestra el contenido más grande"
-  x3: "Muy grande"
-  x3Description: "Muestra el contenido mucho más grande"
-  x4: "Totalmente grande"
-  x4Description: "Muestra el contenido totalmente grande"
-  blur: "Desenfoque"
-  blurDescription: "Para desenfocar el contenido. Se muestra claramente al colocar el puntero encima."
-  font: "Fuente"
-  fontDescription: "Elegir la fuente del contenido"
-  rainbow: "Arcoíris"
-  rainbowDescription: "Muestra el contenido con los colores del arcoíris"
-  sparkle: "Parpadeante"
-  sparkleDescription: "Aplica un efecto de partículas parpadeantes"
-  rotate: "Rotar"
-  rotateDescription: "Rota el contenido a un ángulo especificado."
-  plain: "Plano"
-  plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto MFM."
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"
@@ -1234,14 +1471,14 @@ _tutorial:
   step8_3: "La configuración de las notificaciones puede modificarse posteriormente."
 _2fa:
   alreadyRegistered: "Ya has completado la configuración."
-  registerDevice: "Registrar dispositivo"
-  registerKey: "Registrar clave"
   step1: "Primero, instale en su dispositivo la aplicación de autenticación {a} o {b} u otra."
   step2: "Luego, escanee con la aplicación el código QR mostrado en pantalla."
   step2Url: "En una aplicación de escritorio se puede ingresar la siguiente URL:"
   step3: "Para terminar, ingrese el token mostrado en la aplicación."
   step4: "Ahora cuando inicie sesión, ingrese el mismo token"
   securityKeyInfo: "Se puede configurar el inicio de sesión usando una clave de seguridad de hardware que soporte FIDO2 o con un certificado de huella digital o con un PIN"
+  removeKeyConfirm: "¿Borrar el respaldo \"{name}\"?"
+  renewTOTPCancel: "No gracias"
 _permissions:
   "read:account": "Ver información de la cuenta"
   "write:account": "Editar información de la cuenta"
@@ -1276,18 +1513,20 @@ _permissions:
   "read:gallery-likes": "Ver favoritos de la galería"
   "write:gallery-likes": "Editar favoritos de la galería"
 _auth:
+  shareAccessTitle: "Permisos de la aplicación"
   shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
   shareAccessAsk: "¿Está seguro de que desea autorizar esta aplicación para acceder a su cuenta?"
+  permission: "{name} solicita los siguientes permisos"
   permissionAsk: "Esta aplicación requiere los siguientes permisos"
   pleaseGoBack: "Por favor, vuelve a la aplicación"
   callback: "Volviendo a la aplicación"
   denied: "Acceso denegado"
+  pleaseLogin: "Se requiere un inicio de sesión para darle permisos a la aplicación"
 _antennaSources:
   all: "Todas las notas"
   homeTimeline: "Notas de los usuarios que sigues"
   users: "Notas de un usuario o varios"
   userList: "Notas de los usuarios de una lista"
-  userGroup: "Notas de los usuarios de una grupo"
 _weekday:
   sunday: "Domingo"
   monday: "Lunes"
@@ -1320,10 +1559,12 @@ _widgets:
   jobQueue: "Cola de trabajos"
   serverMetric: "Estadísticas del servidor"
   aiscript: "Consola de AiScript"
+  aiscriptApp: "Aplicación AiScript"
   aichan: "indigo"
   userList: "Lista de usuarios"
   _userList:
     chooseList: "Seleccione una lista"
+  clicker: "Cliqueador"
 _cw:
   hide: "Ocultar"
   show: "Ver más"
@@ -1360,8 +1601,6 @@ _visibility:
   followersDescription: "Visible sólo para tus seguidores"
   specified: "Mensaje directo"
   specifiedDescription: "Visible sólo para los usuarios elegidos"
-  localOnly: "Solo local"
-  localOnlyDescription: "Oculto para usuarios remotos"
 _postForm:
   replyPlaceholder: "Responder a esta nota"
   quotePlaceholder: "Citar esta nota"
@@ -1426,7 +1665,16 @@ _timelines:
   social: "Social"
   global: "Global"
 _play:
+  new: "Crear guión"
+  edit: "Editar guión"
+  created: "Guión creado"
+  updated: "Guión editado"
+  deleted: "Guión eliminado"
+  pageSetting: "Configuración de guión"
+  editThisPage: "Editar este guión"
   viewSource: "Ver la fuente"
+  my: "Mis guiones"
+  liked: "Guiones que te gustaron"
   featured: "Popular"
   title: "Título"
   script: "Script"
@@ -1490,15 +1738,13 @@ _notification:
   youGotReply: "Respuesta de {name}"
   youGotQuote: "Citado por {name}"
   youRenoted: "Renotado por {name}"
-  youGotMessagingMessageFromUser: "{name} comenzó un chat contigo"
-  youGotMessagingMessageFromGroup: "Tienes un chat de {name}"
   youWereFollowed: "te ha seguido"
   youReceivedFollowRequest: "Has mandado una solicitud de seguimiento"
   yourFollowRequestAccepted: "Tu solicitud de seguimiento fue aceptada"
-  youWereInvitedToGroup: "Invitado al grupo"
   pollEnded: "Estan disponibles los resultados de la encuesta"
   unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Se han actualizado las notificaciones push"
+  achievementEarned: "Logro desbloqueado"
   _types:
     all: "Todo"
     follow: "Siguiendo"
@@ -1510,7 +1756,6 @@ _notification:
     pollEnded: "La encuesta terminó"
     receiveFollowRequest: "Recibió una solicitud de seguimiento"
     followRequestAccepted: "El seguimiento fue aceptado"
-    groupInvited: "Invitado al grupo"
     app: "Notificaciones desde aplicaciones"
   _actions:
     followBack: "Te sigue de vuelta"
@@ -1540,5 +1785,6 @@ _deck:
     tl: "Linea de tiempo"
     antenna: "Antenas"
     list: "Listas"
+    channel: "Canal"
     mentions: "Menciones"
     direct: "Mensaje directo"

locales/fr-FR.yml

@@ -110,6 +110,7 @@ clickToShow: "Cliquer pour afficher"
 sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
+reactions: "Réactions"
 reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."
@@ -387,13 +388,10 @@ about: "Informations"
 aboutMisskey: "À propos de Misskey"
 administrator: "Administrateur"
 token: "Jeton"
-twoStepAuthentication: "Authentification à deux facteurs"
 moderator: "Modérateur·rice·s"
 moderation: "Modérations"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
 securityKey: "Clé de sécurité"
-securityKeyName: "Nom de la clé"
-registerSecurityKey: "Enregistrer une clé de sécurité"
 lastUsed: "Dernier utilisé"
 unregister: "Se désinscrire"
 passwordLessLogin: "Se connecter sans mot de passe"
@@ -411,24 +409,15 @@ markAsReadAllTalkMessages: "Marquer toutes les discussions comme lues"
 help: "Aide"
 inputMessageHere: "Écrivez votre message ici"
 close: "Fermer"
-group: "Groupe"
-groups: "Groupes"
-createGroup: "Créer un groupe"
-ownedGroups: "Mes groupes"
-joinedGroups: "Groupes rejoints"
 invites: "Invitations"
-groupName: "Nom du groupe"
 members: "Membres"
 transfer: "Transférer"
-messagingWithUser: "Discuter avec un·e autre utilisateur·rice"
-messagingWithGroup: "Discuter avec un groupe"
 title: "Titre"
 text: "Texte"
 enable: "Activer"
 next: "Suivant"
 retype: "Confirmation"
 noteOf: "Notes de {user}"
-inviteToGroup: "Inviter dans un groupe"
 quoteAttached: "Avec citation"
 quoteQuestion: "Souhaitez-vous ajouter une citation ?"
 noMessagesYet: "Pas encore de discussion"
@@ -450,20 +439,15 @@ passwordMatched: "Les mots de passe correspondent"
 passwordNotMatched: "Les mots de passe ne correspondent pas"
 signinWith: "Se connecter avec {x}"
 signinFailed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
-tapSecurityKey: "Appuyez sur votre clé de sécurité"
 or: "OU"
 language: "Langue"
 uiLanguage: "Langue d’affichage de l’interface"
-groupInvited: "Invité au groupe"
 aboutX: "À propos de {x}"
 emojiStyle: "Style des émojis"
 native: "Natif"
 disableDrawer: "Les menus ne s'affichent pas dans le tiroir"
-youHaveNoGroups: "Vous n’avez aucun groupe"
-joinOrCreateGroup: "Vous pouvez être invité·e à rejoindre des groupes existants ou créer votre propre nouveau groupe."
 noHistory: "Pas d'historique"
 signinHistory: "Historique de connexion"
-disableAnimatedMfm: "Désactiver MFM ayant des animations"
 doing: "En cours..."
 category: "Catégorie"
 tags: "Étiquettes"
@@ -831,8 +815,6 @@ deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
 incorrectPassword: "Le mot de passe est incorrect."
 voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
-leaveGroup: "Quitter le groupe"
-leaveGroupConfirm: "Êtes vous sûr de vouloir quitter \"{name}\" ?"
 useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que panneau sur mobile"
 welcomeBackWithName: "Heureux de vous revoir, {name}"
 clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la vérification par courriel."
@@ -916,6 +898,12 @@ show: "Affichage"
 neverShow: "Ne plus afficher"
 remindMeLater: "Peut-être plus tard"
 color: "Couleur"
+_role:
+  priority: "Priorité"
+  _priority:
+    low: "Basse"
+    middle: "Moyen"
+    high: "Haute"
 _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"
@@ -948,6 +936,7 @@ _accountDelete:
 _ad:
   back: "Retour"
   reduceFrequencyOfThisAd: "Voir cette publicité moins souvent"
+  hide: "Cacher "
 _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."
@@ -1003,72 +992,6 @@ _nsfw:
   respect: "Cacher les médias marqués comme contenu sensible"
   ignore: "Afficher les médias sensibles"
   force: "Cacher tous les médias"
-_mfm:
-  cheatSheet: "Antisèche MFM"
-  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Misskey. Vous pouvez vérifier ici les structures utilisables avec MFM."
-  dummy: "La Fédiverse s'agrandit avec Misskey"
-  mention: "Mentionner"
-  mentionDescription: "Vous pouvez afficher un utilisateur spécifique en indiquant une arobase suivie d'un nom d'utilisateur"
-  hashtag: "Hashtags"
-  hashtagDescription: "Vous pouvez afficher un mot-dièse en utilisant un croisillon et du texte"
-  url: "URL"
-  urlDescription: "L'adresse web peut être affichée."
-  link: "Lien"
-  linkDescription: "Une partie précise d'une phrase peut être liée à l'adresse web."
-  bold: "Gras"
-  boldDescription: "Il est possible de mettre le texte en exergue en le mettant en gras."
-  small: "Diminuer l'emphase"
-  smallDescription: "Le contenu peut être affiché en petit et fin."
-  center: "Centrer"
-  centerDescription: "Le contenu peut être centré"
-  inlineCode: "Code (inline)"
-  inlineCodeDescription: "Coloration syntaxique des lignes de code."
-  blockCode: "Bloc de code"
-  blockCodeDescription: "Coloration syntaxique des lignes de code pour les blocs multi-lignes."
-  inlineMath: "Formule mathématique (inline)"
-  inlineMathDescription: "Afficher les formules mathématiques (KaTeX)."
-  blockMath: "Formule mathématique (bloc)"
-  blockMathDescription: "Afficher les formules mathématiques (KaTeX) multi-lignes dans un bloc."
-  quote: "Citer"
-  quoteDescription: "Affiche le contenu sous forme de citation."
-  emoji: "Émojis personnalisés"
-  emojiDescription: "Entourez le nom de l'émoji personnalisé de deux points pour l'afficher."
-  search: "Rechercher"
-  searchDescription: "Affiche une boîte de recherche avec du texte pré-saisi."
-  flip: "Inverser"
-  flipDescription: "Rotation verticale ou horizontale du contenu"
-  jelly: "Animation (Gelée)"
-  jellyDescription: "Donne une animation d'étirement."
-  tada: "Animation (Tada)"
-  tadaDescription: "Donne une animation qui donne une impression de \"Tada !\""
-  jump: "Animation (Saut)"
-  jumpDescription: "Donne une animation qui saute."
-  bounce: "Animation (Rebond)"
-  bounceDescription: "Donne une animation de rebondissement."
-  shake: "Animation (Secousse)"
-  shakeDescription: "Donne une animation tremblante."
-  twitch: "Animation (Tremblement)"
-  twitchDescription: "Donne une animation de tremblement intense."
-  spin: "Animation (Rotation)"
-  spinDescription: "Donne une animation de rotation."
-  x2: "Grand"
-  x2Description: "Afficher le contenu en grand."
-  x3: "Très grand"
-  x3Description: "Afficher le contenu en très grand."
-  x4: "Plus grand"
-  x4Description: "Afficher le contenu en plus grand."
-  blur: "Flou"
-  blurDescription: "Le contenu peut être flouté ; il sera visible en le survolant avec le curseur."
-  font: "Police de caractères"
-  fontDescription: "Il est possible de choisir la police."
-  rainbow: "Arc-en-ciel"
-  rainbowDescription: "Permet d'afficher le contenu en couleurs arc-en-ciel."
-  sparkle: "Paillettes"
-  sparkleDescription: "Ajoute un effet scintillant au contenu."
-  rotate: "Pivoter"
-  rotateDescription: "Faire pivoter à un angle spécifié."
-  plain: "Vu texte non formaté"
-  plainDescription: "Désactive toute la syntaxe interne."
 _instanceTicker:
   none: "Cacher "
   remote: "Montrer pour les utilisateur·ice·s distant·e·s"
@@ -1230,14 +1153,14 @@ _tutorial:
   step8_2: "En les activant, vous recevrez des notifications pour les mentions, les réactions, les suivis, etc., même lorsque Misskey n'est pas ouvert."
 _2fa:
   alreadyRegistered: "Configuration déjà achevée."
-  registerDevice: "Ajouter un nouvel appareil"
-  registerKey: "Enregistrer une clef"
   step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
   step2: "Ensuite, scannez le code QR affiché sur l’écran."
   step2Url: "Vous pouvez également saisir cette URL si vous utilisez un programme de bureau :"
   step3: "Entrez le jeton affiché sur votre application pour compléter la configuration."
   step4: "À partir de maintenant, ce même jeton vous sera demandé à chacune de vos connexions."
   securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser davantage le processus de connexion grâce à une clé de sécurité matérielle qui prend en charge FIDO2, ou bien en configurant l'authentification par empreinte digitale ou par code PIN sur votre appareil."
+  removeKeyConfirm: "Voulez-vous supprimer {name} ?"
+  renewTOTPCancel: "Pas maintenant"
 _permissions:
   "read:account": "Afficher les informations du compte"
   "write:account": "Mettre à jour les informations de votre compte"
@@ -1283,7 +1206,6 @@ _antennaSources:
   homeTimeline: "Notes venant des utilisateur·rice·s auxquel·les je suis abonné"
   users: "Notes venant de la part d’utilisateur·rice·s précis"
   userList: "Notes venant d’une liste spécifique"
-  userGroup: "Notes venant d’utilisateur·rice·s du groupe spécifié"
 _weekday:
   sunday: "Dimanche"
   monday: "Lundi"
@@ -1355,8 +1277,6 @@ _visibility:
   followersDescription: "Publier à vos abonné·e·s uniquement"
   specified: "Direct"
   specifiedDescription: "Publier uniquement aux utilisateur·rice·s mentionné·e·s"
-  localOnly: "Local seulement"
-  localOnlyDescription: "Caché pour les utilisateurs distant"
 _postForm:
   replyPlaceholder: "Répondre à cette note ..."
   quotePlaceholder: "Citez cette note ..."
@@ -1484,12 +1404,9 @@ _notification:
   youGotReply: "Réponse de {name}"
   youGotQuote: "Cité·e par {name}"
   youRenoted: "{name} vous a Renoté"
-  youGotMessagingMessageFromUser: "{name} vous envoyé un message"
-  youGotMessagingMessageFromGroup: "Un message a été envoyé au groupe {name}"
   youWereFollowed: "Vous suit"
   youReceivedFollowRequest: "Vous avez reçu une demande d’abonnement"
   yourFollowRequestAccepted: "Votre demande d’abonnement a été accepté"
-  youWereInvitedToGroup: "Invité·e au groupe"
   pollEnded: "Les résultats du sondage sont disponibles"
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Les notifications push ont été mises à jour"
@@ -1504,7 +1421,6 @@ _notification:
     pollEnded: "Sondages se cloturant"
     receiveFollowRequest: "Demande d'abonnement reçue"
     followRequestAccepted: "Demande d'abonnement acceptée"
-    groupInvited: "Invitation à un groupe"
     app: "Notifications provenant des apps"
   _actions:
     followBack: "Suivre"
@@ -1533,5 +1449,6 @@ _deck:
     tl: "Fil"
     antenna: "Antennes"
     list: "Listes"
+    channel: "Canaux"
     mentions: "Mentions"
     direct: "Direct"

locales/id-ID.yml

@@ -2,6 +2,7 @@
 _lang_: "Bahasa Indonesia"
 headlineMisskey: "Jaringan terhubung melalui catatan"
 introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
+poweredByMisskeyDescription: "{name} adalah sebuah layanan (instance) yang menggunakan platform sumber terbuka <b>Misskey</b>."
 monthAndDay: "{day} {month}"
 search: "Penelusuran"
 notifications: "Pemberitahuan"
@@ -12,6 +13,7 @@ fetchingAsApObject: "Mengambil data dari Fediverse..."
 ok: "OK"
 gotIt: "Saya mengerti"
 cancel: "Batalkan"
+noThankYou: "Tidak sekarang."
 enterUsername: "Masukkan nama pengguna"
 renotedBy: "direnote oleh {user}"
 noNotes: "Tidak ada catatan"
@@ -47,6 +49,7 @@ 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."
 addToList: "Tambahkan ke daftar"
 sendMessage: "Kirim pesan"
+copyRSS: "Salin RSS"
 copyUsername: "Salin nama pengguna"
 searchUser: "Cari pengguna"
 reply: "Balas"
@@ -81,7 +84,7 @@ error: "Galat"
 somethingHappened: "Terjadi kesalahan"
 retry: "Coba lagi"
 pageLoadError: "Gagal memuat halaman."
-pageLoadErrorDescription: "Umumnya disebabkan jaringan atau tembolok perambah. Cobalah bersihkan tembolok peramban lalu tunggu sesaat sebelum mencoba kembali."
+pageLoadErrorDescription: "Umumnya disebabkan jaringan atau tembolok peramban. Cobalah bersihkan tembolok peramban lalu tunggu sesaat sebelum mencoba kembali."
 serverIsDead: "Tidak ada respon dari peladen. Mohon tunggu dan coba beberapa saat lagi."
 youShouldUpgradeClient: "Untuk melihat halaman ini, mohon muat ulang untuk memutakhirkan klienmu."
 enterListName: "Masukkan nama daftar"
@@ -100,6 +103,8 @@ renoted: "Telah direnote"
 cantRenote: "Postingan ini tidak dapat direnote"
 cantReRenote: "Renote tidak dapat direnote"
 quote: "Kutip"
+inChannelRenote: "Hanya renote dalam kanal"
+inChannelQuote: "Hanya kutip dalam kanal"
 pinnedNote: "Catatan yang disematkan"
 pinned: "Sematkan ke profil"
 you: "Kamu"
@@ -107,6 +112,7 @@ clickToShow: "Klik untuk melihat"
 sensitive: "Konten sensitif"
 add: "Tambahkan"
 reaction: "Reaksi"
+reactions: "Reaksi"
 reactionSetting: "Reaksi untuk dimunculkan di bilah reaksi"
 reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
@@ -125,6 +131,7 @@ unblockConfirm: "Apakah kamu yakin ingin membuka blokir akun ini?"
 suspendConfirm: "Apakah kamu yakin ingin membekukan akun ini?"
 unsuspendConfirm: "Apakah kamu yakin ingin membuka pembekuan akun ini?"
 selectList: "Pilih daftar"
+selectChannel: "Pilih kanal"
 selectAntenna: "Pilih Antena"
 selectWidget: "Pilih gawit"
 editWidgets: "Sunting gawit"
@@ -203,6 +210,7 @@ done: "Selesai"
 processing: "Memproses"
 preview: "Pratinjau"
 default: "Bawaan"
+defaultValueIs: "Bawaan: {value}"
 noCustomEmojis: "Tidak ada emoji kustom"
 noJobs: "Tidak ada kerja"
 federating: "memfederasi"
@@ -251,6 +259,8 @@ noMoreHistory: "Tidak ada sejarah lagi"
 startMessaging: "Mulai mengirim pesan"
 nUsersRead: "Dibaca oleh {n}"
 agreeTo: "Saya setuju kepada {0}"
+agreeBelow: "Saya setuju dengan di bawah ini"
+basicNotesBeforeCreateAccount: "Catatan penting"
 tos: "Syarat dan ketentuan"
 start: "Mulai"
 home: "Beranda"
@@ -346,6 +356,8 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Nyalakan reCAPTCHA"
 recaptchaSiteKey: "Site key"
 recaptchaSecretKey: "Secret Key"
+turnstile: "Turnstile"
+enableTurnstile: "Nyalakan Turnstile"
 turnstileSiteKey: "Site key"
 turnstileSecretKey: "Secret Key"
 avoidMultiCaptchaConfirm: "Menggunakan banyak Captcha dapat menyebabkan gangguan. Apakah kamu ingin untuk menonaktifkan Captcha yang lain? Kamu dapat membiarkan fitur ini tetap aktif dengan menekan tombol batal."
@@ -381,12 +393,10 @@ about: "Informasi"
 aboutMisskey: "Tentang Misskey"
 administrator: "Admin"
 token: "Token"
-twoStepAuthentication: "Otentikasi dua faktor"
 moderator: "Moderator"
+moderation: "Moderasi"
 nUsersMentioned: "{n} pengguna disebut"
 securityKey: "Kunci keamanan"
-securityKeyName: "Nama kunci"
-registerSecurityKey: "Daftarkan kunci keamanan"
 lastUsed: "Terakhir digunakan"
 unregister: "Batalkan pendaftaran"
 passwordLessLogin: "Setel login tanpa kata sandi"
@@ -404,24 +414,15 @@ markAsReadAllTalkMessages: "Tandai semua pesan telah dibaca"
 help: "Bantuan"
 inputMessageHere: "Ketik pesan disini"
 close: "Tutup"
-group: "Grup"
-groups: "Grup"
-createGroup: "Buat grup"
-ownedGroups: "Grup yang dimiliki"
-joinedGroups: "Grup yang diikuti"
 invites: "Undang"
-groupName: "Nama grup"
 members: "Anggota"
 transfer: "Transfer"
-messagingWithUser: "Obrolan dengan pengguna lain"
-messagingWithGroup: "Obrolan di dalam grup"
 title: "Judul"
 text: "Teks"
 enable: "Aktifkan"
 next: "Selanjutnya"
 retype: "Masukkan ulang"
 noteOf: "Catatan milik {user}"
-inviteToGroup: "Undang ke grup"
 quoteAttached: "Dikutip"
 quoteQuestion: "Apakah kamu ingin menambahkan kutipan?"
 noMessagesYet: "Tidak ada pesan"
@@ -443,18 +444,17 @@ passwordMatched: "Kata sandi sama"
 passwordNotMatched: "Kata sandi tidak sama"
 signinWith: "Masuk dengan {x}"
 signinFailed: "Tidak dapat masuk. Nama pengguna atau kata sandi yang kamu masukkan salah."
-tapSecurityKey: "Ketuk kunci keamanan kamu"
 or: "atau"
 language: "Bahasa"
 uiLanguage: "Bahasa antarmuka pengguna"
-groupInvited: "Telah diundang ke grup"
 aboutX: "Tentang {x}"
+emojiStyle: "Gaya emoji"
+native: "Native"
 disableDrawer: "Jangan gunakan menu bergaya laci"
-youHaveNoGroups: "Kamu tidak memiliki grup"
-joinOrCreateGroup: "Bergabunglah dengan grup atau kamu dapat membuat grupmu sendiri."
 noHistory: "Tidak ada riwayat"
 signinHistory: "Riwayat masuk"
-disableAnimatedMfm: "Nonaktifkan MFM dengan animasi"
+enableAdvancedMfm: "Nyalakan MFM tingkat lanjut"
+enableAnimatedMfm: "Nyalakan animasi MFM"
 doing: "Sedang berkerja..."
 category: "Kategori"
 tags: "Tandai"
@@ -561,6 +561,7 @@ author: "Pembuat"
 leaveConfirm: "Ada perubahan yang belum disimpan. Apakah kamu ingin membuangnya?"
 manage: "Manajemen"
 plugins: "Plugin"
+preferencesBackups: "Aturan pencadangan"
 deck: "Dek"
 undeck: "Keluar dari dek"
 useBlurEffectForModal: "Gunakan efek buram untuk modal"
@@ -706,6 +707,7 @@ accentColor: "Aksen"
 textColor: "Teks"
 saveAs: "Simpan sebagai…"
 advanced: "Tingkat lanjut"
+advancedSettings: "Pengaturan Lanjut"
 value: "Nilai"
 createdAt: "Dibuat pada"
 updatedAt: "Diperbarui pada"
@@ -822,8 +824,6 @@ deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
 incorrectPassword: "Kata sandi salah."
 voteConfirm: "Konfirmasi suara kamu untuk ({choice})？"
 hide: "Sembunyikan"
-leaveGroup: "Keluar grup"
-leaveGroupConfirm: "Apakah kamu yakin untuk keluar dari \"{name}\"?"
 useDrawerReactionPickerForMobile: "Tampilkan bilah reaksi sebagai laci di ponsel"
 welcomeBackWithName: "Selamat datang kembali, {name}."
 clickToFinishEmailVerification: "Mohon klik [{ok}] untuk menyelesaikan verifikasi email."
@@ -849,17 +849,400 @@ failedToFetchAccountInformation: "Gagal untuk mendapatkan informasi akun"
 rateLimitExceeded: "Batas sudah terlampaui"
 cropImage: "potong gambar"
 cropImageAsk: "Ingin memotong gambar?"
+cropYes: "Potong"
+cropNo: "Gunakan apa adanya"
 file: "Berkas"
+recentNHours: "{n} jam terakhir"
+recentNDays: "{n} hari terakhir"
+noEmailServerWarning: "Mail Server tidak disetel."
+thereIsUnresolvedAbuseReportWarning: "Ada laporan yang belum diselesaikan."
+recommended: "Disarankan"
+check: "Cek"
+driveCapOverrideLabel: "Ubah kapasitas drive untuk user ini"
+driveCapOverrideCaption: "Setel ulang kapasitas ke bawaan dengan memasukkan nilai 0 atau lebih rendah."
+requireAdminForView: "Kamu harus login dengan akun administrator untuk melihat ini."
+isSystemAccount: "Akun yang dibuat dan otomatis dioperasikan oleh sistem."
+typeToConfirm: "Mohon masukkan {x} untuk mengonfirmasi"
+deleteAccount: "Hapus Akun"
+document: "Dokumen"
+numberOfPageCache: "Jumlah halaman ditembolokkan"
+numberOfPageCacheDescription: "Menaikkan jumlah ini akan meningkatkan kenyamanan untuk pengguna, namun dapat menyebabkan lonjakan beban pada peladen dan juga memori yang digunakan."
+logoutConfirm: "Anda yakin ingin keluar?"
+lastActiveDate: "Terakhir digunakan"
+statusbar: "Bilah status"
+pleaseSelect: "Pilih opsi..."
 reverse: "Balik"
 colored: "Diwarnai"
+refreshInterval: "Jeda pembaharuan"
 label: "Label"
+type: "Tipe"
+speed: "Kecepatan"
+slow: "Lambat"
+fast: "Cepat"
+sensitiveMediaDetection: "Deteksi media NSFW"
 localOnly: "Hanya lokal"
+remoteOnly: "Hanya remot"
+failedToUpload: "Gagal mengunggah"
+cannotUploadBecauseInappropriate: "Berkas ini tidak dapat diunggah karena sebagian dari berkas terdeteksi berpotensi NSFW."
+cannotUploadBecauseNoFreeSpace: "Gagal mengunggah karena kekurangan kapasitas Drive."
+beta: "Beta"
+enableAutoSensitive: "Penandaan NSFW otomatis"
+enableAutoSensitiveDescription: "Mendeteksi otomatis dan menandai media NSFW menggunakan Machine Learning jika memungkinkan. Meskipun opsi ini dimatikan, ada kemungkinan dinyalakan secara menyeluruh pada instansi peladen."
+activeEmailValidationDescription: "Membolehkan validasi alamat surel ketat dengan mengecek apakah alamat surel tersebut temporer dan bisa berkomunikasi dengan surel tersebut. Ketidak tidak dicentang, hanya format surel yang divalidasi."
+navbar: "Bilah navigasi"
+shuffle: "Acak"
 account: "Akun"
+move: "Pindah"
+pushNotification: "Pemberitahuan push"
+subscribePushNotification: "Nyalakan pemberitahuan push"
+unsubscribePushNotification: "Matikan pemberitahuan push"
+pushNotificationAlreadySubscribed: "Pemberitahuan push telah dinyalakan"
+pushNotificationNotSupported: "Browser atau instansi kamu tidak mendukung pemberitahuan push"
+sendPushNotificationReadMessage: "Hapus pemberitahuan push ketika pemberitahuan relevan atau pesan telah dibaca"
+sendPushNotificationReadMessageCaption: "Pemberitahuan berisi teks「{emptyPushNotificationMessage}」akan ditampilkan dalam waktu pendek. Ini mungkin dapat menambah pemakaian baterai pada perangkat kamu."
+windowMaximize: "Maksimalkan"
+windowRestore: "Kembalikan"
+caption: "Keterangan"
+loggedInAsBot: "Sedang login sebagai bot"
+tools: "Alat"
+cannotLoad: "Tidak dapat memuat"
+numberOfProfileView: "tayang profil"
 like: "Suka"
 unlike: "Tidak Suka"
 numberOfLikes: "Jumlah yang disukai"
 show: "Tampilkan"
+neverShow: "Jangan tampilkan lagi"
+remindMeLater: "Mungkin nanti"
+didYouLikeMisskey: "Apakah kamu mulai menyukai Misskey?"
+pleaseDonate: "{host} menggunakan perangkat lunak bebas yaitu Misskey. Kami sangat mengapresiasi sekali donasi dari kamu agar pengembangan Misskey tetap dapat berlanjut!"
+roles: "Peran"
+role: "Peran"
+normalUser: "Pengguna umum"
+undefined: "Tak terdefinisi"
+assign: "Tetapkan\n"
+unassign: "Batalkan penetapan"
 color: "Warna"
+manageCustomEmojis: "Kelola Emoji Kustom"
+youCannotCreateAnymore: "Kamu melewati batas pembuatan."
+cannotPerformTemporary: "Sementara Tidak Tersedia"
+cannotPerformTemporaryDescription: "Aksi ini tidak dapat dilakukan sementara karena melewati batas eksekusi. Mohon tunggu sejenak dan coba lagi."
+preset: "Prasetel"
+selectFromPresets: "Pilih dari prasetel"
+achievements: "Pencapaian"
+gotInvalidResponseError: "Respon peladen tidak valid"
+gotInvalidResponseErrorDescription: "Peladen tidak dapat dijangkau atau sedang dalam perawatan. Mohon coba lagi nanti."
+thisPostMayBeAnnoying: "Catatan ini mungkin dapat mengganggu orang lain."
+thisPostMayBeAnnoyingHome: "Catat ke linimasa beranda"
+thisPostMayBeAnnoyingCancel: "Batalkan"
+thisPostMayBeAnnoyingIgnore: "Tetap catat"
+collapseRenotes: "Tutup renote yang sudah kamu lihat"
+internalServerError: "Kesalahan internal peladen"
+internalServerErrorDescription: "Peladen sedang mengalami galat tak terduga"
+copyErrorInfo: "Salin detil galat"
+_achievements:
+  earnedAt: "Terbuka pada"
+  _types:
+    _notes1:
+      title: "Cus, baru gabung Misskey nih!"
+      description: "Catat catatan pertama kamu"
+      flavor: "Selamat bersenang-senang dengan Misskey!"
+    _notes10:
+      title: "Beberapa catatan"
+      description: "Catat 10 catatan"
+    _notes100:
+      title: "Banyak catatan"
+      description: "Catat 100 catatan"
+    _notes500:
+      title: "Tertumpuk catatan"
+      description: "Catat 500 catatan"
+    _notes1000:
+      title: "Gunung catatan"
+      description: "Catat 1000 catatan"
+    _notes5000:
+      title: "Luapan catatan"
+      description: "Catat 5000 catatan"
+    _notes10000:
+      title: "Catatan super"
+      description: "Catat 10 ribu catatan"
+    _notes20000:
+      title: "Butuh... banyak... catatan..."
+      description: "Catat 20 ribu catatan"
+    _notes30000:
+      title: "Catat, catat, catat !"
+      description: "Catat 30 ribu catatan"
+    _notes40000:
+      title: "Pabrik catatan"
+      description: "Catat 40 ribu catatan"
+    _notes50000:
+      title: "Planet catatan"
+      description: "Catat 50 ribu catatan"
+    _notes60000:
+      title: "Kuasar catatan"
+      description: "Catat 60 ribu catatan"
+    _notes70000:
+      title: "Lubang hitam catatan"
+      description: "Catat 70 ribu catatan"
+    _notes80000:
+      title: "Galaksi catatan"
+      description: "Catat 80 ribu catatan"
+    _notes90000:
+      title: "Semesta catatan"
+      description: "Catat 90 ribu catatan"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Catat 100 ribu catatan"
+      flavor: "Banyak bacot ya kamu."
+    _login3:
+      title: "Pemula I"
+      description: "Login selama 3 hari"
+      flavor: "Mulai hari ini, panggil gue Misskist"
+    _login7:
+      title: "Pemula II"
+      description: "Login selama 7 hari"
+      flavor: "Sudah mulai terbiasa?"
+    _login15:
+      title: "Pemula III"
+      description: "Login selama 15 hari"
+    _login30:
+      title: "Misskist I"
+      description: "Login selama 30 hari"
+    _login60:
+      title: "Misskist II"
+      description: "Login selama 60 hari"
+    _login100:
+      title: "Misskist III"
+      description: "Login selama 100 hari"
+      flavor: "Violent Misskist"
+    _login200:
+      title: "Reguler I"
+      description: "Login selama 200 hari"
+    _login300:
+      title: "Reguler II"
+      description: "Login selama 300 hari"
+    _login400:
+      title: "Reguler III"
+      description: "Login selama 400 hari"
+    _login500:
+      title: "Veteran I"
+      description: "Login selama 500 hari"
+      flavor: "Kawanku, aku suka catatan."
+    _login600:
+      title: "Veteran II"
+      description: "Login selama 600 hari"
+    _login700:
+      title: "Veteran III"
+      description: "Login selama 700 hari"
+    _login800:
+      title: "Sepuh Catatan I"
+      description: "Login selama 800 hari"
+    _login900:
+      title: "Sepuh Catatan II"
+      description: "Login selama 900 hari"
+    _login1000:
+      title: "Sepuh Catatan III"
+      description: "Login selama 1000 hari"
+      flavor: "Terima kasih telah menggunakan Misskey!"
+    _noteClipped1:
+      title: "Harus... Ngeklip..."
+      description: "Klip catatan pertamamu"
+    _noteFavorited1:
+      title: "Pengamat Bintang"
+      description: "Favoritkan catatan pertamamu"
+    _myNoteFavorited1:
+      title: "Pencari Bintang"
+      description: "Minta orang lain memfavoritkan salah satu catatanmu"
+    _profileFilled:
+      title: "Siap Sedia"
+      description: "Atur profil kamu"
+    _markedAsCat:
+      title: "Aku Seekor Kucing"
+      description: "Tandai akunmu sebagai kucing"
+      flavor: "Aku beri kamu nama nanti"
+    _following1:
+      title: "Ikuti pengguna lain pertamamu"
+      description: "Ikuti pengguna"
+    _following10:
+      title: "Terusin... terusin..."
+      description: "Ikuti 10 pengguna lain"
+    _following50:
+      title: "Banyak teman"
+      description: "Ikuti 50 pengguna lain"
+    _following100:
+      title: "100 Teman"
+      description: "Ikuti 100 pengguna lain"
+    _following300:
+      title: "Kelebihan teman"
+      description: "Mengikuti 300 pengguna lain"
+    _followers1:
+      title: "Pengikut pertama"
+      description: "Dapatkan 1 pengikut"
+    _followers10:
+      title: "Ikuti aku!"
+      description: "Dapatkan 10 pengikut"
+    _followers50:
+      title: "Rame-rame"
+      description: "Dapatkan 50 pengikut"
+    _followers100:
+      title: "Terkenal"
+      description: "Dapatkan 100 pengikut"
+    _followers300:
+      title: "Mohon antri satu baris"
+      description: "Dapatkan 300 pengikut"
+    _followers500:
+      title: "Stasiun Informasi"
+      description: "Dapatkan 500 pengikut"
+    _followers1000:
+      title: "Influencer"
+      description: "Dapatkan 1000 pengikut"
+    _collectAchievements30:
+      title: "Kolektor pencapaian"
+      description: "Dapatkan 30 pencapaian"
+    _viewAchievements3min:
+      title: "Suka Pencapaian"
+      description: "Lugat daftar pencapaianmu setidaknya 3 menit"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Catat \"I ❤ #Misskey\""
+      flavor: "Tim pengembang misskey sangat mengapresiasi dukungan kamu!"
+    _foundTreasure:
+      title: "Berburu Harta Karun"
+      description: "Kamu telah menemukan harta karun tersembunyi"
+    _client30min:
+      title: "Istirahat pendek"
+      description: "Habiskan waktu 30 menit di Misskey"
+    _noteDeletedWithin1min:
+      title: "Eh, salah coy!"
+      description: "Hapus catatan kurang dari semenit kamu catat"
+    _postedAtLateNight:
+      title: "Nokturnal"
+      description: "Catat catatan di tengah malam hari"
+      flavor: "Udah waktunya boboq."
+    _postedAt0min0sec:
+      title: "Jam ngomong"
+      description: "Catat catatan di jam 00.00"
+      flavor: "Tik Tok Tik Toeeeng"
+    _selfQuote:
+      title: "Rujukan mandiri"
+      description: "Kutip catatanmu sendiri"
+    _htl20npm:
+      title: "Linimasa mengalir"
+      description: "Memiliki linimasa beranda dengan kecepatan melebihi 20 cpm (catatan per menit)"
+    _viewInstanceChart:
+      title: "Analis"
+      description: "Lihat bagan instansimu"
+    _outputHelloWorldOnScratchpad:
+      title: "Halo, dunia!"
+      description: "Munculkan \"hello world\" di Scratchpad"
+    _open3windows:
+      title: "Jendela ganda"
+      description: "Memiliki setidaknya 3 jendela yang terbuka secara bersamaan"
+    _driveFolderCircularReference:
+      title: "Referensi Siklus"
+      description: "Mencoba membuat folder bersarang rekursif di Drive"
+    _reactWithoutRead:
+      title: "Beneran udah dibaca?"
+      description: "Mereaksi catatan dengan 100 karakter panjangnya dalam 3 detik setelah dicatat"
+    _clickedClickHere:
+      title: "Klik di sini"
+      description: "Kamu telah mengeklik disini"
+    _justPlainLucky:
+      title: "Lagi Beruntung"
+      description: "Mendapatkan kesempatan dengan kemungkinan 0.01% setiap 10 detik"
+    _setNameToSyuilo:
+      title: "God Complex"
+      description: "Atur namamu jadi \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "Perayaan Satu Tahun"
+      description: "Satu tahun telah lewat sejak akunmu dibuat"
+    _passedSinceAccountCreated2:
+      title: "Perayaan Dua Tahun"
+      description: "Dua tahun telah lewat sejak akunmu dibuat"
+    _passedSinceAccountCreated3:
+      title: "Perayaan Tiga Tahun"
+      description: "Tiga tahun telah lewat sejak akunmu dibuat"
+    _loggedInOnBirthday:
+      title: "Selamat Ulang Tahun"
+      description: "Login di hari ulang tahunmu"
+    _loggedInOnNewYearsDay:
+      title: "Selamat Tahun Baru!"
+      description: "Login di hari pertama tahun baru"
+      flavor: "Untuk tahun baru yang berkah bagi instansi ini"
+    _cookieClicked:
+      title: "Permainan dimana kamu mengeklik kue"
+      description: "Mengeklik kue"
+      flavor: "Tunggu, apakah kamu sedang berada di website yang benar?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Posting tautan mengenai Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
+_role:
+  new: "Buat peran"
+  edit: "Sunting peran"
+  name: "Nama peran"
+  description: "Deskripsi peran"
+  permission: "Perijinan peran"
+  descriptionOfPermission: "<b>Moderator</b> dapat melakukan operasi moderasi dasar.\n<b>Administrator</b> dapat mengubah seluruh pengaturan instansi."
+  assignTarget: "Tipe tugas"
+  descriptionOfAssignTarget: "<b>Manual</b> untuk mengganti secara manual siapa yang mendapatkan peran ini dan siapa yang tidak.\n<b>Kondisional</b> untuk pengguna secara otomatis dimasukkan atau dihapus dari peran berdasarkan kondisi yang ditentukan."
+  manual: "Manual"
+  conditional: "Kondisional"
+  condition: "Kondisi"
+  isConditionalRole: "Ini adalah peran kondisional"
+  isPublic: "Publikkan Peran"
+  descriptionOfIsPublic: "Siapapun dapat melihat daftar pengguna yang ditugaskan pada peran ini. Tambahan juga peran ini akan ditampilkan ke dalam profil pengguna tentang peran yang ditugaskan."
+  options: "Opsi peran"
+  policies: "Kebijakan"
+  baseRole: "Templat peran"
+  useBaseValue: "Gunakan nilai templat peran"
+  chooseRoleToAssign: "Pilih peran yang ditugaskan"
+  iconUrl: "URL ikon"
+  asBadge: "Tampilkan sebagai lencana"
+  descriptionOfAsBadge: "Ikon peran ini akan ditampilkan bersebelahan dengan username pengguna yang memiliki peran ini jika dinyalakan."
+  canEditMembersByModerator: "Perbolehkan moderator untuk menyunting daftar anggota untuk peran ini"
+  descriptionOfCanEditMembersByModerator: "Ketika dinyalakan, moderator beserta administrator dapat menugaskan ataupun mencabut pengguna ke peran ini. Ketika dimatikan, hanya administrator saja yang dapat menugaskan pengguna ke peran ini."
+  priority: "Prioritas"
+  _priority:
+    low: "Rendah"
+    middle: "Sedang"
+    high: "Tinggi"
+  _options:
+    gtlAvailable: "Dapat melihat linimasa global"
+    ltlAvailable: "Dapat melihat linimasa lokal"
+    canPublicNote: "Dapat mengirim catatan publik"
+    canInvite: "Dapat membuat kode undangan instansi"
+    canManageCustomEmojis: "Dapat mengelola Emoji kustom"
+    driveCapacity: "Kapasitas Drive"
+    pinMax: "Jumlah maksimal catatan yang disematkan"
+    antennaMax: "Jumlah maksimum antena"
+    wordMuteMax: "Jumlah maksimum karakter yang diperbolehkan dalam membisukan kata"
+    webhookMax: "Jumlah maksimum Webhook"
+    clipMax: "Jumlah maksimum Klip"
+    noteEachClipsMax: "Jumlah maksimum catatan di dalam Klip"
+    userListMax: "Jumlah maksimum daftar pengguna"
+    userEachUserListsMax: "Jumlah maksimum pengguna dalam dsftar pengguna"
+    rateLimitFactor: "Batas kecepatan"
+    descriptionOfRateLimitFactor: "Batas kecepatan yang rendah tidak begitu membatasi, batas kecepatan tinggi lebih membatasi. "
+    canHideAds: "Dapat menyembunyikan iklan"
+  _condition:
+    isLocal: "Pengguna lokal"
+    isRemote: "Pengguna remote"
+    createdLessThan: "Telah berlalu kurang dari X sejak pembuatan akun"
+    createdMoreThan: "Telah berlalu lebih dari X sejak pembuatan akun"
+    followersLessThanOrEq: "Memiliki pengikut X atau kurang dari tersebut"
+    followersMoreThanOrEq: "Memiliki pengikut X atau lebih dari tersebut"
+    followingLessThanOrEq: "Mengikuti X pengguna atau kurang dari itu"
+    followingMoreThanOrEq: "Mengikuti X pengguna atau lebih dari itu"
+    and: "Kondisi-AND"
+    or: "Kondisi-OR"
+    not: "Kondisi-NOT"
+_sensitiveMediaDetection:
+  description: "Mengurangi usaha moderasi server dengan mengenali media NSFW srcara otomatis menggunakan Machine Learning. Fungsi ini akan sedikit menaikkan beban peladen."
+  sensitivity: "Sensitivitas deteksi"
+  sensitivityDescription: "Mengurangi sensitivitas akan mengurangi misdeteksi (false positive) sedangkan meningkatkannya akan menambah misdeteksi (false positive)."
+  setSensitiveFlagAutomatically: "Tandai sebagai NSFW"
+  setSensitiveFlagAutomaticallyDescription: "Hasil dari deteksi internal akan dipertahankan meskipun fungsi ini dimatikan."
+  analyzeVideos: "Nyalakan analisis terhadap video"
+  analyzeVideosDescription: "Analisa video sebagai tambahan dari gambar. Ini akan sedikit meningkatkan beban ke peladen."
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
@@ -884,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "Kembali"
   reduceFrequencyOfThisAd: "Tampilkan iklan ini lebih sedikit"
+  hide: "Jangan tampilkan"
 _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."
@@ -902,6 +1286,24 @@ _plugin:
   install: "Memasang plugin"
   installWarn: "Mohon jangan memasang plugin yang tidak dapat dipercayai."
   manage: "Manajemen plugin"
+_preferencesBackups:
+  list: "Cadangan yang dibuat"
+  saveNew: "Simpan cadangan baru"
+  loadFile: "Muat dari berkas"
+  apply: "Terapkan pada perangkat ini"
+  save: "Simpan perubahan"
+  inputName: "Mohon masukkan nama untuk cadangan ini"
+  cannotSave: "Gagal menyimpan"
+  nameAlreadyExists: "Cadangan bernama \"{name}\" sudah ada. Mohon gunakan nama lain."
+  applyConfirm: "Apakah kamu yakin untuk menerapkan cadangan \"{name}\" ke perangkat ini? Pengaturan yang sudah ada di perangkat ini nantinya akan ditimpa."
+  saveConfirm: "Simpan cadangan sebagai {name}?"
+  deleteConfirm: "Hapus cadangan {name}?"
+  renameConfirm: "Ganti cadangan ini dari \"{old}\" ke \"{new}\"?"
+  noBackups: "Tidak ada cadangan. Kamu dapat mencadangkan pengaturanmu di peladen ini dengan menggunakan \"Buat cadangan baru\"."
+  createdAt: "Dibuat pada: {date} {time}"
+  updatedAt: "Diperbarui pada: {date} {time}"
+  cannotLoad: "Gagal memuat"
+  invalidFile: "Format berkas tidak valid"
 _registry:
   scope: "Lingkup"
   key: "Kunci"
@@ -921,70 +1323,6 @@ _nsfw:
   respect: "Sembunyikan media NSFW"
   ignore: "Jangan sembunyikan media NSFW"
   force: "Sembunyikan semua media"
-_mfm:
-  cheatSheet: "Contekan MFM"
-  intro: "MFM adalah Misskey-exclusive Markup Language yang dapat digunakan di banyak tempat. Berikut kamu bisa melihat daftar dari syntax MFM yang ada."
-  dummy: "Misskey membentangkan dunia Fediverse"
-  mention: "Sebut"
-  mentionDescription: "Kamu dapat menentukan pengguna tertentu dengan menggunakan simbol-At dan nama engguna mereka."
-  hashtag: "Tagar"
-  hashtagDescription: "Kamu dapat menentukan tagar dengan menggunakan angka dan teks."
-  url: "URL"
-  urlDescription: "URL dapat ditampilkan."
-  link: "Tautan"
-  linkDescription: "Bagian tertentu dari teks dapat ditampilka sebagai URL."
-  bold: "Tebal"
-  boldDescription: "Sorot tulisan dengan membuatnya tebal."
-  small: "Kecil"
-  smallDescription: "Tampilkan konten kecil dan tipis."
-  center: "Tengah"
-  centerDescription: "Tampilkan konten di tengah."
-  inlineCode: "Kode (Dalam baris)"
-  inlineCodeDescription: "Menampilkan sorotan sintaks dalam baris untuk kode(program-)."
-  blockCode: "Kode (Blok)"
-  blockCodeDescription: "Menampilkan sorotan sintaks untuk kode(program-) multi baris dalam sebuah blok."
-  inlineMath: "Matematika (Dalam baris)"
-  inlineMathDescription: "Menampilkan formula matematika (KaTeX) dalam baris."
-  blockMath: "Matematika (Blok)"
-  blockMathDescription: "Menampilkan formula matematika (KaTeX) multibaris dalam sebuah blok."
-  quote: "Kutip"
-  quoteDescription: "Menampilkan konten sebagai kutipan."
-  emoji: "Emoji kustom"
-  emojiDescription: "Emoji kustom dapat ditampilkan dengan mengurung nama emoji kustom menggunakan tanda titik dua."
-  search: "Penelusuran"
-  searchDescription: "Menampilkan kotak pencarian dengan teks yang sudah dimasukkan."
-  flip: "Balik"
-  flipDescription: "Balikkan konten secara horizontal atau vertikal."
-  jelly: "Animasi (Jelly)"
-  jellyDescription: "Menerapkan animasi seperti jelly"
-  tada: "Animasi (Tada)"
-  tadaDescription: "Menerapkan animasi seperti \"Kejutan!\"."
-  jump: "Animasi (Loncat)"
-  jumpDescription: "Menerapkan animasi melompat."
-  bounce: "Animasi (Melambung)"
-  bounceDescription: "Menerapkan animasi melambung."
-  shake: "Animasi (Goyang)"
-  shakeDescription: "Menerapkan animasi bergoyang."
-  twitch: "Animasi (Cubit)"
-  twitchDescription: "Terapkan animasi cubit yang kuat."
-  spin: "Animasi (Putar)"
-  spinDescription: "Terapkan animasi putar."
-  x2: "Besar"
-  x2Description: "Tampilkan konten menjadi besar."
-  x3: "Lebih besar"
-  x3Description: "Tampilkan konten menjadi lebih besar."
-  x4: "Sangat besar"
-  x4Description: "Tampilka konten menjadi sangat besar."
-  blur: "Buram"
-  blurDescription: "Konten dapat diburamkan dengan efek ini. Konten dapat ditampilkan dengan jelas dengan melayangkan kursor tetikus di atasnya."
-  font: "Font"
-  fontDescription: "Setel font yang ditampilkan untuk konten."
-  rainbow: "Pelangi"
-  rainbowDescription: "Membuat konten muncul dalam warna pelangi."
-  sparkle: "Kelap-kelip"
-  sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
-  rotate: "Putar"
-  rotateDescription: "Putar konten sesuai sudut yang ditentukan."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
@@ -1142,16 +1480,19 @@ _tutorial:
   step7_1: "Yay, Selamat! Kamu sudah menyelesaikan tutorial dasar Misskey."
   step7_2: "Jika kamu ingin mempelajari lebih lanjut tentang Misskey, cobalah berkunjung ke bagian {help}."
   step7_3: "Semoga berhasil dan bersenang-senanglah! 🚀"
+  step8_1: "Yang terakhir, apakah kamu ingin menyalakam pemberitahuan push?"
+  step8_2: "Menyalakan ini akan memungkinkan kamu menerima pemberitahuan untuk sebutan, reaksi, ikuti, dll. Bahkan ketika Misskey sedang tidak dibuka."
+  step8_3: "Kamu dapat mengganti pengaturan ini nanti."
 _2fa:
   alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
-  registerDevice: "Daftarkan perangkat baru"
-  registerKey: "Daftarkan kunci keamanan baru"
   step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu."
   step2: "Lalu, pindai kode QR yang ada di layar."
   step2Url: "Di aplikasi desktop, masukkan URL berikut:"
   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."
   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."
+  removeKeyConfirm: "Hapus cadangan {name}?"
+  renewTOTPCancel: "Tidak sekarang."
 _permissions:
   "read:account": "Lihat informasi akun"
   "write:account": "Sunting informasi akun"
@@ -1186,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "Lihat daftar postingan galeri yang disukai"
   "write:gallery-likes": "Sunting daftar postingan galeri yang disukai"
 _auth:
+  shareAccessTitle: "Mendapatkan ijin akses aplikasi"
   shareAccess: "Apakah kamu ingin mengijinkan \"{name}\" untuk mengakses akun ini?"
   shareAccessAsk: "Apakah kamu ingin mengijinkan aplikasi ini untuk mengakses akun kamu?"
+  permission: "{name} meminta ijin berikut"
   permissionAsk: "Aplikasi ini membutuhkan beberapa ijin, yaitu:"
   pleaseGoBack: "Mohon kembali ke aplikasi kamu"
   callback: "Mengembalikan kamu ke aplikasi"
   denied: "Akses ditolak"
+  pleaseLogin: "Mohon masuk untuk otorisasi aplikasi."
 _antennaSources:
   all: "Semua catatan"
   homeTimeline: "Catatan dari pengguna yang diikuti"
   users: "Catatan dari pengguna tertentu"
   userList: "Catatan dari daftar tertentu"
-  userGroup: "Catatan dari pengguna dalam grup yang ditentukan"
 _weekday:
   sunday: "Minggu"
   monday: "Senin"
@@ -1216,10 +1559,13 @@ _widgets:
   trends: "Tren"
   clock: "Jam"
   rss: "Pembaca RSS"
+  rssTicker: "RSS-Ticker"
   activity: "Aktivitas"
   photos: "Foto"
   digitalClock: "Jam digital"
+  unixClock: "Jam UNIX"
   federation: "Federasi"
+  instanceCloud: "Instansi awan"
   postForm: "Buat catatan"
   slideshow: "Slideshow"
   button: "Tombol"
@@ -1229,8 +1575,10 @@ _widgets:
   aiscript: "Konsol AiScript"
   aiscriptApp: "Aplikasi AiScript"
   aichan: "Ai"
+  userList: "Daftar pengguna"
   _userList:
     chooseList: "Pilih daftar"
+  clicker: "Pengeklik"
 _cw:
   hide: "Sembunyikan"
   show: "Lihat konten"
@@ -1267,8 +1615,6 @@ _visibility:
   followersDescription: "Catat ke pengikut saja"
   specified: "Langsung"
   specifiedDescription: "Catat ke pengguna yang ditentukan saja"
-  localOnly: "Hanya lokal"
-  localOnlyDescription: "Hanya dapat dilihat di instansi lokal"
 _postForm:
   replyPlaceholder: "Balas ke catatan ini..."
   quotePlaceholder: "Kutip catatan ini..."
@@ -1294,6 +1640,7 @@ _profile:
   changeBanner: "Ubah header"
 _exportOrImport:
   allNotes: "Semua catatan"
+  favoritedNotes: "Catatan favorit"
   followingList: "Ikuti"
   muteList: "Bisukan"
   blockingList: "Blokir"
@@ -1405,14 +1752,13 @@ _notification:
   youGotReply: "{name} membalas kamu"
   youGotQuote: "{name} mengutip kamu"
   youRenoted: "{name} me-renote kamu"
-  youGotMessagingMessageFromUser: "{name} mengirimi kamu pesan"
-  youGotMessagingMessageFromGroup: "Sebuah pesan telah dikirim ke grup {name}"
   youWereFollowed: "Mengikuti kamu"
   youReceivedFollowRequest: "Kamu menerima permintaan mengikuti"
   yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima"
-  youWereInvitedToGroup: "Telah diundang ke grup"
   pollEnded: "Hasil Kuesioner telah keluar"
+  unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Pembaruan notifikasi dorong"
+  achievementEarned: "Pencapaian didapatkan"
   _types:
     all: "Semua"
     follow: "Ikuti"
@@ -1424,7 +1770,6 @@ _notification:
     pollEnded: "Jajak pendapat berakhir"
     receiveFollowRequest: "Permintaan mengikuti diterima"
     followRequestAccepted: "Permintaan mengikuti disetujui"
-    groupInvited: "Diundang ke grup"
     app: "Pemberitahuan dari aplikasi"
   _actions:
     followBack: "Ikuti Kembali"
@@ -1434,6 +1779,7 @@ _deck:
   alwaysShowMainColumn: "Selalu tampilkan kolom utama"
   columnAlign: "Luruskan kolom"
   addColumn: "Tambahkan kolom"
+  configureColumn: "Atur kolom"
   swapLeft: "Pindah ke kiri"
   swapRight: "Pindah ke kanan"
   swapUp: "Pindah ke atas"
@@ -1441,6 +1787,11 @@ _deck:
   stackLeft: "Tumpukkan di kolom kiri"
   popRight: "Keluarkan di kanan"
   profile: "Profil"
+  newProfile: "Profil baru"
+  deleteProfile: "Hapus profil"
+  introduction: "Buat antarmuka sempurna untukmu dengan menata kolom secara bebas!"
+  introduction2: "Klik \"+\" pada kanan layar untuk menambahkan kolom baru kapanpun yang kamu mau."
+  widgetsIntroduction: "Mohon pilih \"Sunting gawit\" pada menu kolom dan tambahkan gawit."
   _columns:
     main: "Utama"
     widgets: "Widget"
@@ -1448,5 +1799,6 @@ _deck:
     tl: "Linimasa"
     antenna: "Antena"
     list: "Daftar"
+    channel: "Kanal"
     mentions: "Sebutan"
     direct: "Langsung"

locales/index.js

@@ -34,6 +34,7 @@ const languages = [
 	'pt-PT',
 	'ru-RU',
 	'sk-SK',
+	'th-TH',
 	'ug-CN',
 	'uk-UA',
 	'vi-VN',

locales/it-IT.yml

@@ -1,17 +1,17 @@
 ---
 _lang_: "Italiano"
 headlineMisskey: "Rete collegata tramite note"
-introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n🚀 Esplora un nuovo mondo insieme a noi!"
+introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n\n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n\n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n\n🚀 Esplora un nuovo mondo insieme a noi!"
 poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
 search: "Cerca"
 notifications: "Notifiche"
 username: "Nome utente"
 password: "Password"
-forgotPassword: "Hai dimenticato la tua password?"
+forgotPassword: "Hai dimenticato la password?"
 fetchingAsApObject: "Recuperando dal Fediverso..."
 ok: "OK"
-gotIt: "Ho capito"
+gotIt: "ok!"
 cancel: "Annulla"
 noThankYou: "No grazie"
 enterUsername: "Inserisci un nome utente"
@@ -46,7 +46,7 @@ copyContent: "Copia il contenuto"
 copyLink: "Copia il link"
 delete: "Elimina"
 deleteAndEdit: "Elimina e modifica"
-deleteAndEditConfirm: "Vuoi davvero cancellare questa nota e scriverla di nuovo? Verrano eliminate anche tutte le reazioni, Rinote e risposte collegate."
+deleteAndEditConfirm: "Vuoi davvero cancellare questa nota e scriverla di nuovo? Verranno eliminate anche tutte le reazioni, rinote e risposte collegate."
 addToList: "Aggiungi alla lista"
 sendMessage: "Invia messaggio"
 copyRSS: "Copia RSS"
@@ -75,7 +75,7 @@ lists: "Liste"
 noLists: "Nessuna lista"
 note: "Nota"
 notes: "Note"
-following: "Follows"
+following: "Lǝ segui"
 followers: "Followers"
 followsYou: "Ti segue"
 createList: "Aggiungi una nuova lista"
@@ -84,18 +84,18 @@ error: "Errore"
 somethingHappened: "Si è verificato un problema"
 retry: "Riprova"
 pageLoadError: "Caricamento pagina non riuscito. "
-pageLoadErrorDescription: "Questo viene normalmente causato dalla rete o dalla cache del browser. Si prega di pulire la cache, o di attendere e riprovare più tardi."
+pageLoadErrorDescription: "Questo problema viene normalmente causato da errori di rete o dalla cache del browser. Si prega di pulire la cache, o di attendere e riprovare più tardi."
 serverIsDead: "Il server non risponde. Si prega di attendere e riprovare più tardi."
 youShouldUpgradeClient: "Per visualizzare la pagina è necessario aggiornare il client alla nuova versione e ricaricare."
 enterListName: "Nome della lista"
 privacy: "Privacy"
-makeFollowManuallyApprove: "Richiedi di approvare i follower manualmente"
+makeFollowManuallyApprove: "Approva i follower manualmente"
 defaultNoteVisibility: "Privacy predefinita delle note"
 follow: "Segui"
 followRequest: "Richiesta di follow"
 followRequests: "Richieste di follow"
 unfollow: "Smetti di seguire"
-followRequestPending: "La richiesta di follow deve essere approvata"
+followRequestPending: "Richiesta in approvazione"
 enterEmoji: "Inserisci emoji"
 renote: "Rinota"
 unrenote: "Annulla rinota"
@@ -103,6 +103,8 @@ renoted: "Rinotato!"
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
 quote: "Cita"
+inChannelRenote: "Rinota nel canale"
+inChannelQuote: "Cita nel canale"
 pinnedNote: "Nota fissata"
 pinned: "Fissa sul profilo"
 you: "Tu"
@@ -110,6 +112,7 @@ clickToShow: "Clicca per visualizzare"
 sensitive: "Contenuto sensibile"
 add: "Aggiungi"
 reaction: "Reazioni"
+reactions: "Reazioni"
 reactionSetting: "Reazioni visualizzate sul pannello"
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
@@ -118,7 +121,7 @@ markAsSensitive: "Segna come sensibile"
 unmarkAsSensitive: "Segna come non sensibile"
 enterFileName: "Nome del file"
 mute: "Silenzia"
-unmute: "Riattiva"
+unmute: "Riattiva l'audio"
 block: "Blocca"
 unblock: "Sblocca"
 suspend: "Sospendi"
@@ -128,6 +131,7 @@ unblockConfirm: "Vuoi davvero sbloccare il profilo?"
 suspendConfirm: "Vuoi sospendere questo profilo?"
 unsuspendConfirm: "Vuoi revocare la sospensione si questo profilo?"
 selectList: "Seleziona una lista"
+selectChannel: "Seleziona canale"
 selectAntenna: "Scegli un'antenna"
 selectWidget: "Seleziona il riquadro"
 editWidgets: "Modifica i riquadri"
@@ -139,7 +143,7 @@ emojiName: "Nome dell'emoji"
 emojiUrl: "URL dell'emoji"
 addEmoji: "Aggiungi un emoji"
 settingGuide: "Configurazione suggerita"
-cacheRemoteFiles: "Memorizzazione nella cache dei file remoti"
+cacheRemoteFiles: "Memorizza i file remoti nella cache"
 cacheRemoteFilesDescription: "Disabilitando questa opzione, i file remoti verranno linkati direttamente senza essere memorizzati nella cache. Sarà possibile risparmiare spazio di archiviazione sul server, ma il traffico aumenterà in quanto non verranno generate anteprime."
 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."
@@ -150,7 +154,7 @@ flagShowTimelineRepliesDescription: "Se è attiva, la timeline mostra le rispost
 autoAcceptFollowed: "Accetta automaticamente le richieste di follow da utenti che già segui"
 addAccount: "Aggiungi profilo"
 loginFailed: "Accesso non riuscito"
-showOnRemote: "Sfoglia sull'istanza remota"
+showOnRemote: "Visualizza sull'istanza remota"
 general: "Generali"
 wallpaper: "Sfondo"
 setWallpaper: "Imposta sfondo"
@@ -205,14 +209,14 @@ intro: "L'installazione di Misskey è terminata! Si prega di creare il profilo a
 done: "Fine"
 processing: "In elaborazione"
 preview: "Anteprima"
-default: "Predefinito"
+default: "Medio"
 defaultValueIs: "Predefinito: {value}"
 noCustomEmojis: "Nessun emoji"
 noJobs: "Nessun lavoro"
 federating: "Federazione"
 blocked: "Bloccato"
 suspended: "Sospensione"
-all: "Tutti"
+all: "Tutte"
 subscribing: "Iscrizione"
 publishing: "Pubblicazione"
 notResponding: "Nessuna risposta"
@@ -230,7 +234,7 @@ more: "Di più!"
 featured: "Tendenze"
 usernameOrUserId: "Nome utente o ID utente"
 noSuchUser: "Nessun utente trovato"
-lookup: "Cercare"
+lookup: "Cerca"
 announcements: "Annunci"
 imageUrl: "URL dell'immagine"
 remove: "Elimina"
@@ -255,6 +259,8 @@ noMoreHistory: "Non c'è più cronologia da visualizzare"
 startMessaging: "Nuovo messaggio"
 nUsersRead: "Letto da {n} persone"
 agreeTo: "Sono d'accordo con {0}"
+agreeBelow: "Accetto quanto riportato sotto"
+basicNotesBeforeCreateAccount: "Note importanti"
 tos: "Termini di servizio"
 start: "Inizia!"
 home: "Home"
@@ -282,7 +288,7 @@ selectFolders: "Seleziona cartella"
 renameFile: "Rinomina file"
 folderName: "Nome della cartella"
 createFolder: "Nuova cartella"
-renameFolder: "Rinominare cartella"
+renameFolder: "Rinomina cartella"
 deleteFolder: "Elimina cartella"
 addFile: "Allega"
 emptyDrive: "Il Drive è vuoto"
@@ -299,7 +305,7 @@ avatar: "Foto del profilo"
 banner: "Intestazione"
 nsfw: "Contenuti sensibili"
 whenServerDisconnected: "Quando la connessione col server è persa"
-disconnectedFromServer: "Disconness@ dal server"
+disconnectedFromServer: "Il server si è disconnesso"
 reload: "Ricarica"
 doNothing: "Nessun'azione"
 reloadConfirm: "Vuoi ricaricare?"
@@ -310,9 +316,9 @@ reject: "Rifiuta"
 normal: "Normale"
 instanceName: "Nome dell'istanza"
 instanceDescription: "Descrizione dell'istanza"
-maintainerName: "Nome dell'Amministratore"
-maintainerEmail: "Indirizzo e-mail dell'Amministratore"
-tosUrl: "Termini di servizio URL"
+maintainerName: "Nome dell'amministratore"
+maintainerEmail: "Indirizzo e-mail dell'amministratore"
+tosUrl: "URL dei termini del servizio e della privacy"
 thisYear: "Anno"
 thisMonth: "Mese"
 today: "Oggi"
@@ -321,13 +327,13 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Pagine"
 integration: "App collegate"
-connectService: "Connessione"
-disconnectService: "Disconnessione "
-enableLocalTimeline: "Abilita Timeline locale"
-enableGlobalTimeline: "Abilita Timeline federata"
-disablingTimelinesInfo: "Anche se disabiliti queste timeline, gli amministratori e i moderatori potranno sempre accederci."
+connectService: "Connetti"
+disconnectService: "Disconnetti"
+enableLocalTimeline: "Abilita la timeline locale"
+enableGlobalTimeline: "Abilita la timeline federata"
+disablingTimelinesInfo: "Anche disabilitandole, gli Amministratori e i Moderatori potranno comunque accedervi."
 registration: "Iscriviti"
-enableRegistration: "Permettere nuove registrazioni"
+enableRegistration: "Consenti a chiunque di registrarsi"
 invite: "Invita"
 driveCapacityPerLocalAccount: "Capienza del Drive per profilo locale"
 driveCapacityPerRemoteAccount: "Capienza del Drive per profilo remoto"
@@ -340,7 +346,7 @@ pinnedUsers: "Utenti in evidenza"
 pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagina \"Esplora\", un@ per riga."
 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 nota in evidenza"
+pinnedClipId: "ID della Clip in evidenza"
 pinnedNotes: "Nota fissata"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Abilita hCaptcha"
@@ -387,13 +393,10 @@ about: "Informazioni"
 aboutMisskey: "Informazioni di Misskey"
 administrator: "Amministratore"
 token: "Token"
-twoStepAuthentication: "Autenticazione a due fattori"
 moderator: "Moderatore"
 moderation: "moderazione"
 nUsersMentioned: "{n} profili menzionati"
 securityKey: "Chiave di sicurezza"
-securityKeyName: "Nome della chiave"
-registerSecurityKey: "Registra una chiave di sicurezza"
 lastUsed: "Ultima attività"
 unregister: "Annulla l'iscrizione"
 passwordLessLogin: "Accedi senza password"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "Segna tutte le chat come lette"
 help: "Guida"
 inputMessageHere: "Scrivi messaggio qui"
 close: "Chiudi"
-group: "Gruppo"
-groups: "Gruppi"
-createGroup: "Nuovo gruppo"
-ownedGroups: "I miei gruppi"
-joinedGroups: "Gruppi a cui mi sono unit@"
 invites: "Inviti"
-groupName: "Nome del gruppo"
 members: "Membri"
 transfer: "Trasferisci"
-messagingWithUser: "Iniziare una chat con un altr@ utente"
-messagingWithGroup: "Chattare in gruppo"
 title: "Titolo"
 text: "Testo"
 enable: "Abilita"
 next: "Avanti"
 retype: "Conferma"
 noteOf: "Note di {user}"
-inviteToGroup: "Invitare al gruppo"
 quoteAttached: "Citazione allegata"
 quoteQuestion: "Vuoi aggiungere una citazione?"
 noMessagesYet: "Ancora nessuna chat"
@@ -450,20 +444,17 @@ passwordMatched: "Corretta"
 passwordNotMatched: "Le password non corrispondono."
 signinWith: "Accedi con {x}"
 signinFailed: "Autenticazione non riuscita. Controlla la tua password e nome utente."
-tapSecurityKey: "Premi la chiave di sicurezza"
 or: "oppure"
 language: "Lingua"
 uiLanguage: "Lingua di visualizzazione dell'interfaccia"
-groupInvited: "Invitat@ al gruppo"
 aboutX: "Informazioni su {x}"
 emojiStyle: "Stile emoji"
 native: "Nativo"
 disableDrawer: "Non mostrare il menù sul drawer"
-youHaveNoGroups: "Nessun gruppo"
-joinOrCreateGroup: "Puoi creare il tuo gruppo o essere invitat@ a gruppi che già esistono."
 noHistory: "Nessuna cronologia"
 signinHistory: "Storico degli accessi al profilo"
-disableAnimatedMfm: "Disabilità i MFM animati"
+enableAdvancedMfm: "Attiva MFM avanzati"
+enableAnimatedMfm: "Attiva MFM animati"
 doing: "In corso..."
 category: "Categoria"
 tags: "Tag"
@@ -473,7 +464,7 @@ existingAccount: "Profilo esistente"
 regenerate: "Generare di nuovo"
 fontSize: "Dimensione carattere"
 noFollowRequests: "Non hai alcuna richiesta di follow"
-openImageInNewTab: "Aprire immagini in una nuova scheda"
+openImageInNewTab: "Apri le immagini in un nuovo tab"
 dashboard: "Pannello di controllo"
 local: "Locale"
 remote: "Remoto"
@@ -602,7 +593,7 @@ smtpPass: "Password"
 emptyToDisableSmtpAuth: "Lasciare il nome utente e la password vuoti per disabilitare la verifica SMTP"
 smtpSecure: "Usare la porta SSL/TLS implicito per le connessioni SMTP"
 smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
-testEmail: "Testare la consegna di posta elettronica"
+testEmail: "Testa la consegna di posta elettronica"
 wordMute: "Filtri parole"
 regexpError: "errore regex"
 regexpErrorDescription: "Si è verificato un errore nell'espressione regolare alla riga {line} della parola muta {tab}:"
@@ -615,7 +606,7 @@ metrics: "Statistiche"
 overview: "Anteprima"
 logs: "Log"
 delayed: "Ritardo"
-database: "Base di dati"
+database: "Base dati"
 channel: "Canale"
 create: "Crea"
 notificationSetting: "Impostazioni notifiche"
@@ -651,11 +642,11 @@ random: "Casuale"
 system: "Sistema"
 switchUi: "Cambiare interfaccia"
 desktop: "Desktop"
-clip: "Nota"
+clip: "Clip"
 createNew: "Crea"
-optional: "Opzionale"
-createNewClip: "Nuova Nota"
-unclip: "Rimuovi la nota"
+optional: "facoltativo"
+createNewClip: "Crea una Clip"
+unclip: "Togli Nota dalla Clip"
 confirmToUnclipAlreadyClippedNote: "Questa nota è già inclusa in \"{name}\". Si desidera escludere la nota?"
 public: "Pubblica"
 i18nInfo: "Misskey è tradotto in diverse lingue da volontari. Anche tu puoi contribuire su {link}."
@@ -704,7 +695,7 @@ narrow: "Stretto"
 reloadToApplySetting: "Le tue preferenze verranno impostate dopo il ricaricamento della pagina. Vuoi ricaricare adesso?"
 needReloadToApply: "È necessario riavviare per rendere effettive le modifiche."
 showTitlebar: "Visualizza la barra del titolo"
-clearCache: "Svuota cache"
+clearCache: "Svuota la cache"
 onlineUsersCount: "{n} utenti online"
 nUsers: "{n} utenti"
 nNotes: "{n}Note"
@@ -729,9 +720,9 @@ currentVersion: "Versione attuale"
 latestVersion: "Ultima versione"
 youAreRunningUpToDateClient: "Stai usando la versione più recente del client."
 newVersionOfClientAvailable: "Una nuova versione del tuo client è disponibile."
-usageAmount: "In utilizzo"
+usageAmount: "In uso"
 capacity: "Capacità"
-inUse: "In utilizzo"
+inUse: "In uso"
 editCode: "Modifica codice"
 apply: "Applica"
 receiveAnnouncementFromInstance: "Ricevi i messaggi informativi dall'istanza"
@@ -817,7 +808,7 @@ breakFollow: "Smetti di seguire"
 itsOn: "Abilitato"
 itsOff: "Disabilitato"
 emailRequiredForSignup: "L'ndirizzo e-mail è obbligatorio per registrarsi"
-unread: "Non letto"
+unread: "Non lette"
 filter: "Filtri"
 controlPanel: "Pannello di controllo"
 manageAccounts: "Gestisci i profili"
@@ -833,10 +824,8 @@ deleteAccountConfirm: "Così verrà eliminato il profilo. Vuoi procedere?"
 incorrectPassword: "La password è errata."
 voteConfirm: "Votare per「{choice}」?"
 hide: "Nascondere"
-leaveGroup: "Esci dal gruppo"
-leaveGroupConfirm: "Uscire da「{name}」?"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
-welcomeBackWithName: "Eccoti di nuovo, {name}! Ciao!"
+welcomeBackWithName: "Ciao, {name}! Eccoti di nuovo!"
 clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
 overridedDeviceKind: "Tipo di dispositivo"
 smartphone: "Smartphone"
@@ -857,9 +846,11 @@ oneDay: "1 giorno"
 oneWeek: "1 settimana"
 reflectMayTakeTime: "Potrebbe essere necessario un po' di tempo perché ciò abbia effetto."
 failedToFetchAccountInformation: "Impossibile recuperare le informazioni sul profilo"
-rateLimitExceeded: "Superato il limite di velocità."
-cropImage: "Ritaglio dell'immagine"
-cropImageAsk: "Si desidera ritagliare l'immagine?"
+rateLimitExceeded: "Superato il limite di richieste."
+cropImage: "Ritaglia l'immagine"
+cropImageAsk: "Vuoi ritagliare l'immagine?"
+cropYes: "Ritaglia"
+cropNo: "Non ritagliare"
 file: "Allegati"
 recentNHours: "Ultime {n} ore"
 recentNDays: "Ultimi {n} giorni"
@@ -924,7 +915,326 @@ neverShow: "Non mostrare più"
 remindMeLater: "Rimanda"
 didYouLikeMisskey: "Ti piace Misskey?"
 pleaseDonate: "Misskey è il software libero utilizzato su {host}. Offrendo una donazione è più facile continuare a svilupparlo!"
+roles: "Ruoli"
+role: "Ruolo"
+normalUser: "Profilo standard"
+undefined: "Indefinito"
+assign: "Assegna"
+unassign: "Disassegna"
 color: "Colore"
+manageCustomEmojis: "Gestisci le emoji personalizzate"
+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."
+preset: "Preimpostato"
+selectFromPresets: "Seleziona preimpostato"
+achievements: "Obiettivi raggiunti"
+gotInvalidResponseError: "Risposta del server non valida"
+gotInvalidResponseErrorDescription: "Il server potrebbe essere irraggiungibile o in manutenzione. Riprova più tardi."
+thisPostMayBeAnnoying: "Questa nota potrebbe essere offensiva"
+thisPostMayBeAnnoyingHome: "Pubblica sulla timeline principale"
+thisPostMayBeAnnoyingCancel: "Annulla"
+thisPostMayBeAnnoyingIgnore: "Pubblica lo stesso"
+collapseRenotes: "Comprimi i Rinota già letti"
+internalServerError: "Errore interno del server"
+internalServerErrorDescription: "Si è verificato un errore imprevisto all'interno del server"
+copyErrorInfo: "Copia le informazioni sull'errore"
+_achievements:
+  earnedAt: "Data di conseguimento"
+  _types:
+    _notes1:
+      title: "Hai iniziato a usare Misskey"
+      description: "Hai pubblicato la prima Nota"
+      flavor: "Goditi la vita su Misskey!"
+    _notes10:
+      title: "Alcune Note"
+      description: "Hai inserito 10 Note"
+    _notes100:
+      title: "Un po' di Note"
+      description: "Hai inserito 100 Note"
+    _notes500:
+      title: "Un bel po' di Note"
+      description: "Hai inserito 500 Note"
+    _notes1000:
+      title: "Una montagna di Note"
+      description: "Hai inserito 1.000 Note"
+    _notes5000:
+      title: "Un sovraccarico di Note!"
+      description: "Hai inserito 5.000 Note"
+    _notes10000:
+      title: "SuperNote!"
+      description: "Hai inserito 10.000 Note"
+    _notes20000:
+      title: "Voglio più... Note!"
+      description: "Hai inserito 20.000 Note"
+    _notes30000:
+      title: "Note, Note, Note!"
+      description: "Hai inserito 30.000 Note"
+    _notes40000:
+      title: "Una fabbrica di Note"
+      description: "Hai inserito 40.000 Note"
+    _notes50000:
+      title: "Un pianeta di Note"
+      description: "Hai inserito 50.000 Note"
+    _notes60000:
+      title: "Un quasar di Note"
+      description: "Hai inserito 60.000 Note"
+    _notes70000:
+      title: "Un buco nero supermassiccio di Note"
+      description: "Hai inserito 70.000 Note"
+    _notes80000:
+      title: "Una galassia di Note"
+      description: "Hai inserito 80.000 Note"
+    _notes90000:
+      title: "Un universo di Note!"
+      description: "Hai inserito 90.000 Note"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Hai inserito 100.000 Note"
+      flavor: "Hai molto da scrivere?"
+    _login3:
+      title: "Principiante I"
+      description: "Hai totalizzato 3 accessi!"
+      flavor: "Da oggi, chiamatemi Misskist"
+    _login7:
+      title: "Principiante II"
+      description: "Hai totalizzato 7 accessi!"
+      flavor: "Ti sembra di avere la situazione sotto controllo?"
+    _login15:
+      title: "Principiante III"
+      description: "Hai totalizzato 15 accessi!"
+    _login30:
+      title: "Misskist I"
+      description: "Hai totalizzato 30 accessi!"
+    _login60:
+      title: "Misskeist II"
+      description: "Hai totalizzato 60 accessi!"
+    _login100:
+      title: "Misskeist III"
+      description: "Hai totalizzato 100 accessi!"
+      flavor: "Violent Misskeist"
+    _login200:
+      title: "Regolare I livello"
+      description: "Hai totalizzato 200 accessi!"
+    _login300:
+      title: "Regolare II livello"
+      description: "Hai totalizzato 300 accessi!"
+    _login400:
+      title: "Regolare III livello"
+      description: "Hai totalizzato 400 accessi!"
+    _login500:
+      title: "Professionista I livello"
+      description: "Hai totalizzato 500 accessi!"
+      flavor: "Amici cari, mi piacciono le Note"
+    _login600:
+      title: "Professionista II livello"
+      description: "Hai totalizzato 600 accessi!"
+    _login700:
+      title: "Professionista III livello"
+      description: "Hai totalizzato 700 accessi!"
+    _login800:
+      title: "Maestro di Note I livello"
+      description: "Hai totalizzato 800 accessi!"
+    _login900:
+      title: "Maestro di Note II livello"
+      description: "Hai totalizzato 900 accessi!"
+    _login1000:
+      title: "Maestro di Note III livello"
+      description: "Hai totalizzato 1000 accessi!"
+      flavor: "Grazie per aver usato Misskey!"
+    _noteClipped1:
+      title: "Devo clippare!"
+      description: "Hai raccolto la tua prima Nota in una Clip"
+    _noteFavorited1:
+      title: "Guarda le stelle"
+      description: "Aggiungi una Nota ai preferiti per la prima volta"
+    _myNoteFavorited1:
+      title: "Fornitura stelline"
+      description: "Qualcuno ha preferito una delle tue Note"
+    _profileFilled:
+      title: "Preparazione perfetta!"
+      description: "Imposta il tuo profilo"
+    _markedAsCat:
+      title: "Io sono un gatto"
+      description: "Aggiungi le orecchie da gatto al tuo profilo"
+      flavor: "Ti chiamerò..."
+    _following1:
+      title: "Il mio primo Follow"
+      description: "Hai seguito il tuo primo profilo"
+    _following10:
+      title: "Segui, segui!"
+      description: "Hai seguito 10 profili"
+    _following50:
+      title: "Tanti amici"
+      description: "Hai seguito 50 profili"
+    _following100:
+      title: "Cento amici"
+      description: "Hai seguito 100 profili"
+    _following300:
+      title: "Sovraccarico di amici"
+      description: "Hai seguito 300 profili"
+    _followers1:
+      title: "Il primo profilo tuo Follower"
+      description: "Hai ottenuto il tuo primo Follower"
+    _followers10:
+      title: "Follow me!"
+      description: "Hai ottenuto 10 profili Follower"
+    _followers50:
+      title: "Un gregge di Follower"
+      description: "Hai ottenuto 50 Follower"
+    _followers100:
+      title: "Popolare"
+      description: "Hai ottenuto 100 profili Follower"
+    _followers300:
+      title: "Mettetevi in fila"
+      description: "Hai ottenuto 300 Follower"
+    _followers500:
+      title: "Trasmettitore"
+      description: "Hai ottenuto 500 Follower"
+    _followers1000:
+      title: "Influenzer"
+      description: "Hai superato i 1.000 profili Follower"
+    _collectAchievements30:
+      title: "Collezionista di successi"
+      description: "Hai raggiunto 30 obiettivi"
+    _viewAchievements3min:
+      title: "Mi piacciono i risultati"
+      description: "Guarda la tua collezione di obiettivi per almeno 3 minuti"
+    _iLoveMisskey:
+      title: "I LOVE Misskey"
+      description: "Pubblica «I ♥ #Misskey»"
+      flavor: "Grazie per aver utilizzato Misskey! Dal team di sviluppo"
+    _foundTreasure:
+      title: "Caccia al tesoro"
+      description: "Hai trovato un tesoro nascosto"
+    _client30min:
+      title: "Piccola grande pausa"
+      description: "Hai passato più di 30 minuti su Misskey"
+    _noteDeletedWithin1min:
+      title: "Ooops!"
+      description: "Hai eliminato una nota entro un minuto dalla sua pubblicazione"
+    _postedAtLateNight:
+      title: "Biassanot!"
+      description: "Hai pubblicato una nota in tarda notte"
+      flavor: "Andiamo a dormire presto"
+    _postedAt0min0sec:
+      title: "Mezzanotte"
+      description: "Hai pubblicato una Nota a mezzanotte in punto"
+      flavor: "tic, tac, tic, tac! Gong!"
+    _selfQuote:
+      title: "Autoreferenziale"
+      description: "Hai citato una delle tue Note"
+    _htl20npm:
+      title: "Timeline scorrevole"
+      description: "La tua Timeline personale ha superato la velocità di 20 Note orarie (Note al minuto)"
+    _viewInstanceChart:
+      title: "Analista"
+      description: "Visualizza i grafici dell'istanza"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "Hai scritto «Hello world» nel blocco appunti"
+    _open3windows:
+      title: "Apri le finestre!"
+      description: "Hai aperto almeno 3 finestre contemporaneamente"
+    _driveFolderCircularReference:
+      title: "Riferimento circolare"
+      description: "Hai provato a nidificare in modo ricorsivo le cartelle del Drive"
+    _reactWithoutRead:
+      title: "Hai letto bene?"
+      description: "Hai reagito ad una Nota più lunga di 100 caratteri entro 3 secondi dalla sua pubblicazione"
+    _clickedClickHere:
+      title: "Clicca qui"
+      description: "Hai cliccato qui"
+    _justPlainLucky:
+      title: "Proprio fortunato"
+      description: "Ottenuto con una probabilità dello 0,01% ogni 10 secondi"
+    _setNameToSyuilo:
+      title: "Complesso divino"
+      description: "Hai impostati il tuo nome in «syuilo»"
+    _passedSinceAccountCreated1:
+      title: "Primo Anniversario"
+      description: "È passato un anno da quando hai creato il profilo"
+    _passedSinceAccountCreated2:
+      title: "Secondo Anniversario"
+      description: "Sono passati due anni da quando hai creato il profilo"
+    _passedSinceAccountCreated3:
+      title: "Terzo Anniversario"
+      description: "Sono passati tre anni da quando hai creato il profilo"
+    _loggedInOnBirthday:
+      title: "Buon compleanno!"
+      description: "Hai effettuato l'accesso il giorno del tuo compleanno"
+    _loggedInOnNewYearsDay:
+      title: "Buon anno nuovo!"
+      description: "Hai usato effettuato l'accesso il giorno di capodanno"
+      flavor: "Anche quest'anno, grazie per il tuo continuo supporto a questa istanza"
+    _cookieClicked:
+      title: "Clicca il biscotto"
+      description: "Hai giocato a cliccare il cookie"
+      flavor: "È il sito giusto?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Pubblica un link a Brain Diver"
+      flavor: "Sulle note di Brain Diver"
+_role:
+  new: "Nuovo ruolo"
+  edit: "Modifica ruolo"
+  name: "Nome del ruolo"
+  description: "Descrizione del ruolo"
+  permission: "Permessi globali del ruolo"
+  descriptionOfPermission: "<b>Moderatori</b> possono svolgere le attività di moderazione basilari.\n<b>Amministratori</b> possono modificare la configurazione dell'istanza."
+  assignTarget: "Modalità di assegnazione del ruolo"
+  descriptionOfAssignTarget: "<b>Manuale</b>: per assegnare manualmente questo ruolo ai profili.\n<b>Condizionale</b>: per assegnare o rimuovere automaticamente questo ruolo ai profili, a precise condizioni."
+  manual: "Manuale"
+  conditional: "Condizionale"
+  condition: "Condizioni"
+  isConditionalRole: "Questo è un ruolo condizionato"
+  isPublic: "Ruolo pubblico"
+  descriptionOfIsPublic: "La lista di profili assegnati a questo ruolo è visibile a chiunque. Inoltre, il nome del ruolo verrà mostrato pubblicamente nei relativi profili."
+  options: "Opzioni del ruolo"
+  policies: "Policy"
+  baseRole: "Ruolo di base"
+  useBaseValue: "Eredita dal ruolo base"
+  chooseRoleToAssign: "Seleziona il ruolo da assegnare"
+  iconUrl: "URL dell'icona"
+  asBadge: "Mostra come badge"
+  descriptionOfAsBadge: "Se indicato, accanto al nome utente viene visualizzata l'icona del ruolo."
+  canEditMembersByModerator: "Anche i Moderatori assegnano profili a questo ruolo"
+  descriptionOfCanEditMembersByModerator: "Se disattivo, potranno farlo solamente gli Amministratori."
+  priority: "Priorità"
+  _priority:
+    low: "Bassa"
+    middle: "Medio"
+    high: "Alta"
+  _options:
+    gtlAvailable: "Disponibilità della Timeline Federata"
+    ltlAvailable: "Disponibilità della Timeline Locale"
+    canPublicNote: "Può scrivere Note con Visibilità Pubblica"
+    canInvite: "Genera codici di invito all'istanza"
+    canManageCustomEmojis: "Gestire le emoji personalizzate"
+    driveCapacity: "Capienza del Drive"
+    pinMax: "Quantità massima di Note in primo piano"
+    antennaMax: "Quantità massima di Antenne"
+    wordMuteMax: "Lunghezza massima del filtro parole"
+    webhookMax: "Quantità massima di Webhook"
+    clipMax: "Quantità massima di Clip"
+    noteEachClipsMax: "Quantità massima di Note nella Clip"
+    userListMax: "Quantità massima di liste"
+    userEachUserListsMax: "Quantità massima di profili per lista"
+    rateLimitFactor: "Limite del rapporto"
+    descriptionOfRateLimitFactor: "I rapporti più bassi sono meno restrittivi, quelli più alti lo sono di più."
+    canHideAds: "Può nascondere i banner"
+  _condition:
+    isLocal: "Profilo locale"
+    isRemote: "Profilo remoto"
+    createdLessThan: "Creato meno di"
+    createdMoreThan: "Creato più di"
+    followersLessThanOrEq: "Ha meno di N follower"
+    followersMoreThanOrEq: "Ha più di N follower"
+    followingLessThanOrEq: "Segue N profili o meno"
+    followingMoreThanOrEq: "Segue N profili o più"
+    and: "E"
+    or: "O"
+    not: "NON"
 _sensitiveMediaDetection:
   description: "L'apprendimento automatico può essere utilizzato per individuare automaticamente i media sensibili da moderare. Il carico del server aumenta leggermente."
   sensitivity: "Sensibilità di rilevamento"
@@ -957,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "Indietro"
   reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
+  hide: "Nascondi"
 _forgotPassword:
   enterEmail: "Inserisci l'indirizzo di posta elettronica che hai registrato nel tuo profilo. Il collegamento necessario per ripristinare la password verrà inviato a questo indirizzo."
   ifNoEmail: "Se nessun indirizzo e-mail è stato registrato, si prega di contattare l'amministratore·trice dell'istanza."
@@ -1012,72 +1323,6 @@ _nsfw:
   respect: "Nascondere i media segnati come sensibli"
   ignore: "Visualizzare i media segnati come sensibili"
   force: "Nascondere tutti i media"
-_mfm:
-  cheatSheet: "Bigliettino MFM"
-  intro: "MFM è un linguaggio Markdown particolare che si può usare in diverse parti di Misskey. Qui puoi visualizzare a colpo d'occhio tutta la sintassi MFM utile."
-  dummy: "Il Fediverso si espande con Misskey"
-  mention: "Menzioni"
-  mentionDescription: "Si può menzionare un utente specifico digitando il suo nome utente subito dopo il segno @."
-  hashtag: "Hashtag"
-  hashtagDescription: "Per indicare un hashtag si può usare il segno numerico + tag."
-  url: "URL"
-  urlDescription: "È possibile indicare gli URL"
-  link: "Link"
-  linkDescription: "È possibile associare specifici intervalli di testo agli URL"
-  bold: "Grassetto"
-  boldDescription: "Il testo può essere grassettato per enfasi"
-  small: "vistosamente"
-  smallDescription: "Il contenuto può essere visualizzato più piccolo e più sottile"
-  center: "centratura"
-  centerDescription: "Il contenuto può essere centrato"
-  inlineCode: "Codice (inline)"
-  inlineCodeDescription: "Evidenziazione della sintassi in linea di programmi e altro codice"
-  blockCode: "Codice (blocco)"
-  blockCodeDescription: "Evidenziazione della sintassi di programmi multilinea e di altro codice in blocchi"
-  inlineMath: "Espressione matematica(Immersione)"
-  inlineMathDescription: "Visualizza le formule (KaTeX) in linea."
-  blockMath: "Formula matematica (blocco)"
-  blockMathDescription: "Visualizzazione di formule multilinea (KaTeX) in blocchi."
-  quote: "Cita il nota"
-  quoteDescription: "Può indicare che il contenuto è una citazione."
-  emoji: "Emoji personalizzati"
-  emojiDescription: "Utilizzare i due punti per racchiudere il nome di un'emoji personalizzata e visualizzarla."
-  search: "Cerca"
-  searchDescription: "È possibile visualizzare una casella di ricerca precompilata."
-  flip: "Inverti"
-  flipDescription: "Capovolgere il contenuto verso l'alto o verso il basso, a sinistra o a destra."
-  jelly: "Animazione (Biyon Biyon)."
-  jellyDescription: "Dà un'animazione di salto."
-  tada: "Animazione (jang)."
-  tadaDescription: "Ta-da! dà un'animazione che assomiglia a."
-  jump: "Animazione(salto)"
-  jumpDescription: "Da un animazione che salta su e giù."
-  bounce: "Animazione(rimbalzo)"
-  bounceDescription: "Rende il testo rimbalzante"
-  shake: "rimbalzante"
-  shakeDescription: "Rende il testo traballante"
-  twitch: "testo"
-  twitchDescription: "Fa tremare il testo"
-  spin: "Animazione (rotazione)"
-  spinDescription: "Fornisce un'animazione rotante."
-  x2: "Più grande"
-  x2Description: "Mostra il contenuto ingrandito."
-  x3: "Molto più grande"
-  x3Description: "Mostra il contenuto molto più ingrandito."
-  x4: "Estremamente più grande"
-  x4Description: "Mostra il contenuto estremamente più ingrandito."
-  blur: "Sfocatura"
-  blurDescription: "È possibile rendere sfocato il contenuto. Spostando il cursore su di esso tornerà visibile chiaramente."
-  font: "Tipo di carattere"
-  fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
-  rainbow: "Arcobaleno"
-  rainbowDescription: "Arcobaleno il contenuto."
-  sparkle: "brillantini"
-  sparkleDescription: "Aggiungere effetti particellari scintillanti."
-  rotate: "Ruota"
-  rotateDescription: "Ruota con un angolo specificato."
-  plain: "Testo semplice"
-  plainDescription: "Disattiva tutta la sintassi interna."
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per i profili remoti"
@@ -1199,8 +1444,8 @@ _sfx:
   channel: "Notifiche di canale"
 _ago:
   future: "Futuro"
-  justNow: "Ora"
-  secondsAgo: "{n}s fa"
+  justNow: "Adesso"
+  secondsAgo: "{n} sec fa"
   minutesAgo: "{n} min fa"
   hoursAgo: "{n} ore fa"
   daysAgo: "{n} gg fa"
@@ -1215,14 +1460,14 @@ _time:
 _tutorial:
   title: "Come usare Misskey"
   step1_1: "Eccoci!"
-  step1_2: "Questa pagina si chiama una \" Timeline \". Mostra in ordine cronologico le \" note \" delle persone che segui."
-  step1_3: "Attualmente la tua Timeline è vuota perché non segui alcun profilo e non hai pubblicato alcuna nota ancora."
+  step1_2: "Questa pagina si chiama \"Timeline \" e mostra in ordine cronologico le \"note\" delle persone che segui."
+  step1_3: "Attualmente la tua Timeline è vuota perché non segui alcun profilo e non hai ancora pubblicato alcuna nota."
   step2_1: "Prima di scrivere una «Nota» o di seguire altri profili, prepara il tuo profilo!"
-  step2_2: "Aggiungere qualche informazione su di te aumenterà le tue possibilità di essere seguit@ da altre persone. "
+  step2_2: "Se aggiungi informazioni personali aumenterai le tue possibilità di essere seguit@ da altre persone. "
   step3_1: "Hai finito di impostare il tuo profilo?"
   step3_2: "Ora puoi pubblicare una «Nota». Proviamo subito! Premi il bottone con l'icona «penna» per iniziare a scrivere in una finestra di dialogo.  "
   step3_3: "Scritto il testo della nota, puoi pubblicarla premendo il pulsante nella parte superiore destra della finestra di dialogo."
-  step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena cominciato a usare Misskey\"?"
+  step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena iniziato a usare Misskey\"?"
   step4_1: "Hai pubblicato qualcosa?"
   step4_2: "Se puoi visualizzare la tua nota sulla timeline, ce l'hai fatta!"
   step5_1: "Adesso, cerca di seguire altre persone per vivacizzare la tua timeline. "
@@ -1237,24 +1482,24 @@ _tutorial:
   step7_3: "Da ultimo, buon divertimento su Misskey! 🚀"
   step8_1: "Per concludere, vuoi attivare le notifiche push?"
   step8_2: "Attivandole, otterrai notifiche di follow, reazioni e menzioni anche quando Misskey è chiuso."
-  step8_3: "Puoi anche modificare questa impostazione successivamente."
+  step8_3: "Potrai modificare questa impostazione."
 _2fa:
   alreadyRegistered: "La configurazione è stata già completata."
-  registerDevice: "Aggiungi dispositivo"
-  registerKey: "Chiave di registro."
   step1: "Innanzitutto, installare sul dispositivo un'applicazione di autenticazione come {a} o {b}."
   step2: "Quindi, scansionare il codice QR visualizzato con l'app."
   step2Url: "Nell'applicazione desktop inserire il seguente URL: "
   step3: "Inserite il token visualizzato nell'app e il gioco è fatto."
   step4: "D'ora in poi, quando si accede, si inserisce il token nello stesso modo."
   securityKeyInfo: "È possibile impostare il dispositivo per accedere utilizzando una chiave di sicurezza hardware che supporta FIDO2 o un'impronta digitale o un PIN sul dispositivo."
+  removeKeyConfirm: "Vuoi davvero eliminare \"{name}\"?"
+  renewTOTPCancel: "No grazie"
 _permissions:
-  "read:account": "Visualizzare le informazioni sul profilo"
-  "write:account": "Modificare le informazioni sul profilo"
+  "read:account": "Visualizza le informazioni sul profilo"
+  "write:account": "Modifica le informazioni sul profilo"
   "read:blocks": "Visualizza i profili bloccati"
   "write:blocks": "Gestisci i profili bloccati"
-  "read:drive": "Aprire il Drive"
-  "write:drive": "Gestire il Drive"
+  "read:drive": "Apri il Drive"
+  "write:drive": "Gestisci il Drive"
   "read:favorites": "Visualizza i tuoi preferiti"
   "write:favorites": "Gestisci i tuoi preferiti"
   "read:following": "Vedi le informazioni di follow"
@@ -1282,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "Visualizza i contenuti della galleria."
   "write:gallery-likes": "Manipolazione dei \"Mi piace\" della galleria."
 _auth:
+  shareAccessTitle: "Permessi dell'applicazione"
   shareAccess: "Vuoi autorizzare {name} ad accedere al tuo profilo?"
   shareAccessAsk: "Vuoi autorizzare questa App ad accedere al tuo profilo?"
+  permission: "{name} richiede i permessi seguenti"
   permissionAsk: "Questa app richiede le seguenti autorizzazioni:"
   pleaseGoBack: "Si prega di ritornare sulla app"
   callback: "Ritornando sulla app"
   denied: "Accesso negato"
+  pleaseLogin: "Per favore accedi al tuo account per cambiare i permessi dell'applicazione"
 _antennaSources:
   all: "Tutte le note"
   homeTimeline: "Note dagli utenti che segui"
   users: "Note dagli utenti selezionati"
   userList: "Note dagli utenti della lista selezionata"
-  userGroup: "Note dagli utenti del gruppo selezionato"
 _weekday:
   sunday: "Domenica"
   monday: "Lunedì"
@@ -1340,7 +1587,7 @@ _cw:
 _poll:
   noOnlyOneChoice: "Sono necessarie almeno 2 risposte"
   choiceN: "Opzione {n}"
-  noMore: "Hai aggiunto il numero massimo di opzioni."
+  noMore: "Hai raggiunto il limite di opzioni."
   canMultipleVote: "Possibilità di risposte multiple"
   expiration: "Scadenza"
   infinite: "Non scade"
@@ -1366,21 +1613,19 @@ _visibility:
   homeDescription: "Visibile solo sulla timeline \"Home\""
   followers: "Followers"
   followersDescription: "Visibile solo per i tuoi followers"
-  specified: "Diretta"
+  specified: "Nota diretta"
   specifiedDescription: "Visibile solo ai profili menzionati"
-  localOnly: "Soltanto locale"
-  localOnlyDescription: "Non visibile ai profili remoti"
 _postForm:
-  replyPlaceholder: "Nota la tua risposta.."
-  quotePlaceholder: "Cita Nota..."
-  channelPlaceholder: "Pubblica in canale"
+  replyPlaceholder: "Rispondi a questa nota..."
+  quotePlaceholder: "Cita questa nota..."
+  channelPlaceholder: "Pubblica sul canale..."
   _placeholders:
-    a: "Che succede?"
-    b: "È successo qualcosa?"
-    c: "Che cos'hai in mente?"
+    a: "Come va?"
+    b: "Hai qualcosa da raccontare? Inizia pure..."
+    c: "Stai pensando a qualcosa?"
     d: "Vuoi dire qualcosa?"
-    e: "Scrivi qualcosa qui"
-    f: "Aspettando che scriva..."
+    e: "Puoi scrivere qui..."
+    f: "Inizia pure a scrivere..."
 _profile:
   name: "Nome"
   username: "Nome utente"
@@ -1411,9 +1656,9 @@ _charts:
   notesIncDec: "Variazione del numero di note"
   localNotesIncDec: "Variazione del numero di note locali"
   remoteNotesIncDec: "Variazione del numero di note distanti"
-  notesTotal: "Conteggio totale di note"
+  notesTotal: "Numero di note in totale"
   filesIncDec: "Variazione del numero dei file"
-  filesTotal: "Numero totale di file"
+  filesTotal: "Numero di file in totale"
   storageUsageIncDec: "Variazione dell'utilizzo dell'immagazzinamento"
   storageUsageTotal: "Utilizzo totale dell'immagazzinamento"
 _instanceCharts:
@@ -1505,17 +1750,15 @@ _notification:
   fileUploaded: "File caricato correttamente"
   youGotMention: "{name} ti ha menzionato"
   youGotReply: "{name} ti ha risposto"
-  youGotQuote: "{name} ha citato il tuo Nota e ha detto"
+  youGotQuote: "{name} ha citato la tua Nota e ha detto"
   youRenoted: "{name} ha rinotato"
-  youGotMessagingMessageFromUser: "{name} ti ha mandato un messaggio"
-  youGotMessagingMessageFromGroup: "{name} ti ha mandato un messaggio nella chat"
   youWereFollowed: "Ha iniziato a seguirti"
   youReceivedFollowRequest: "Hai ricevuto una richiesta di follow"
   yourFollowRequestAccepted: "La tua richiesta di follow è stata accettata"
-  youWereInvitedToGroup: "Invitat@ al gruppo"
   pollEnded: "Risultati del sondaggio."
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Le notifiche push sono state aggiornate."
+  achievementEarned: "Obiettivo raggiunto"
   _types:
     all: "Tutto"
     follow: "Novità follower"
@@ -1527,7 +1770,6 @@ _notification:
     pollEnded: "Sondaggio chiuso."
     receiveFollowRequest: "Richiesta di follow ricevuta"
     followRequestAccepted: "Richiesta di follow accettata"
-    groupInvited: "Invito a un gruppo"
     app: "Notifiche da applicazioni"
   _actions:
     followBack: "Segui"
@@ -1557,5 +1799,6 @@ _deck:
     tl: "Timeline"
     antenna: "Antenne"
     list: "Liste"
+    channel: "Canale"
     mentions: "Menzioni"
     direct: "Diretta"

locales/ja-JP.yml

@@ -103,6 +103,8 @@ renoted: "Renoteしました。"
 cantRenote: "この投稿はRenoteできません。"
 cantReRenote: "RenoteをRenoteすることはできません。"
 quote: "引用"
+inChannelRenote: "チャンネル内Renote"
+inChannelQuote: "チャンネル内引用"
 pinnedNote: "ピン留めされたノート"
 pinned: "ピン留め"
 you: "あなた"
@@ -110,6 +112,7 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
+reactions: "リアクション"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
@@ -128,6 +131,7 @@ unblockConfirm: "ブロック解除しますか？"
 suspendConfirm: "凍結しますか？"
 unsuspendConfirm: "解凍しますか？"
 selectList: "リストを選択"
+selectChannel: "チャンネルを選択"
 selectAntenna: "アンテナを選択"
 selectWidget: "ウィジェットを選択"
 editWidgets: "ウィジェットを編集"
@@ -255,6 +259,8 @@ noMoreHistory: "これより過去の履歴はありません"
 startMessaging: "チャットを開始"
 nUsersRead: "{n}人が読みました"
 agreeTo: "{0}に同意"
+agreeBelow: "下記に同意する"
+basicNotesBeforeCreateAccount: "基本的な注意事項"
 tos: "利用規約"
 start: "始める"
 home: "ホーム"
@@ -386,17 +392,20 @@ userList: "リスト"
 about: "情報"
 aboutMisskey: "Misskeyについて"
 administrator: "管理者"
-token: "トークン"
-twoStepAuthentication: "二段階認証"
+token: "確認コード"
+2fa: "二要素認証"
+totp: "認証アプリ"
+totpDescription: "認証アプリを使ってワンタイムパスワードを入力"
 moderator: "モデレーター"
 moderation: "モデレーション"
 nUsersMentioned: "{n}人が投稿"
+securityKeyAndPasskey: "セキュリティキー・パスキー"
 securityKey: "セキュリティキー"
-securityKeyName: "キーの名前"
-registerSecurityKey: "セキュリティキーを登録する"
 lastUsed: "最後の使用"
+lastUsedAt: "最後の使用: {t}"
 unregister: "登録を解除"
-passwordLessLogin: "パスワード無しログイン"
+passwordLessLogin: "パスワードレスログイン"
+passwordLessLoginDescription: "パスワードを使用せず、セキュリティキーやパスキーなどのみでログインします"
 resetPassword: "パスワードをリセット"
 newPasswordIs: "新しいパスワードは「{password}」です"
 reduceUiAnimation: "UIのアニメーションを減らす"
@@ -411,24 +420,15 @@ markAsReadAllTalkMessages: "すべてのチャットを既読にする"
 help: "ヘルプ"
 inputMessageHere: "ここにメッセージを入力"
 close: "閉じる"
-group: "グループ"
-groups: "グループ"
-createGroup: "グループを作成"
-ownedGroups: "所有グループ"
-joinedGroups: "参加しているグループ"
 invites: "招待"
-groupName: "グループ名"
 members: "メンバー"
 transfer: "譲渡"
-messagingWithUser: "ユーザーとチャット"
-messagingWithGroup: "グループでチャット"
 title: "タイトル"
 text: "テキスト"
 enable: "有効にする"
 next: "次"
 retype: "再入力"
 noteOf: "{user}のノート"
-inviteToGroup: "グループに招待"
 quoteAttached: "引用付き"
 quoteQuestion: "引用として添付しますか？"
 noMessagesYet: "まだチャットはありません"
@@ -450,20 +450,17 @@ passwordMatched: "一致しました"
 passwordNotMatched: "一致していません"
 signinWith: "{x}でログイン"
 signinFailed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
-tapSecurityKey: "セキュリティキーにタッチ"
 or: "もしくは"
 language: "言語"
 uiLanguage: "UIの表示言語"
-groupInvited: "グループに招待されました"
 aboutX: "{x}について"
 emojiStyle: "絵文字のスタイル"
 native: "ネイティブ"
 disableDrawer: "メニューをドロワーで表示しない"
-youHaveNoGroups: "グループがありません"
-joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループを作成してください。"
 noHistory: "履歴はありません"
 signinHistory: "ログイン履歴"
-disableAnimatedMfm: "動きのあるMFMを無効にする"
+enableAdvancedMfm: "高度なMFMを有効にする"
+enableAnimatedMfm: "動きのあるMFMを有効にする"
 doing: "やっています"
 category: "カテゴリ"
 tags: "タグ"
@@ -782,6 +779,7 @@ popularPosts: "人気の投稿"
 shareWithNote: "ノートで共有"
 ads: "広告"
 expiration: "期限"
+startingperiod: "開始期間"
 memo: "メモ"
 priority: "優先度"
 high: "高"
@@ -833,8 +831,6 @@ deleteAccountConfirm: "アカウントが削除されます。よろしいです
 incorrectPassword: "パスワードが間違っています。"
 voteConfirm: "「{choice}」に投票しますか？"
 hide: "隠す"
-leaveGroup: "グループから抜ける"
-leaveGroupConfirm: "「{name}」から抜けますか？"
 useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示"
 welcomeBackWithName: "おかえりなさい、{name}さん"
 clickToFinishEmailVerification: "[{ok}]を押して、メールアドレスの確認を完了してください。"
@@ -860,6 +856,8 @@ failedToFetchAccountInformation: "アカウント情報の取得に失敗しま
 rateLimitExceeded: "レート制限を超えました"
 cropImage: "画像のクロップ"
 cropImageAsk: "画像をクロップしますか？"
+cropYes: "クロップする"
+cropNo: "そのまま使う"
 file: "ファイル"
 recentNHours: "直近{n}時間"
 recentNDays: "直近{n}日"
@@ -932,6 +930,263 @@ assign: "アサイン"
 unassign: "アサインを解除"
 color: "色"
 manageCustomEmojis: "カスタム絵文字の管理"
+youCannotCreateAnymore: "これ以上作成することはできません。"
+cannotPerformTemporary: "一時的に利用できません"
+cannotPerformTemporaryDescription: "操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。"
+preset: "プリセット"
+selectFromPresets: "プリセットから選択"
+achievements: "実績"
+gotInvalidResponseError: "サーバーの応答が無効です"
+gotInvalidResponseErrorDescription: "サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから再度お試しください。"
+thisPostMayBeAnnoying: "この投稿は迷惑になる可能性があります。"
+thisPostMayBeAnnoyingHome: "ホームに投稿"
+thisPostMayBeAnnoyingCancel: "やめる"
+thisPostMayBeAnnoyingIgnore: "このまま投稿"
+collapseRenotes: "見たことのあるRenoteを省略して表示"
+internalServerError: "サーバー内部エラー"
+internalServerErrorDescription: "サーバー内部で予期しないエラーが発生しました。"
+copyErrorInfo: "エラー情報をコピー"
+joinThisServer: "このサーバーに登録する"
+exploreOtherServers: "他のサーバーを探す"
+letsLookAtTimeline: "タイムラインを見てみる"
+disableFederationWarn: "連合が無効になっています。無効にしても投稿が非公開にはなりません。ほとんどの場合、このオプションを有効にする必要はありません。"
+
+_achievements:
+  earnedAt: "獲得日時"
+  _types:
+    _notes1:
+      title: "just setting up my msky"
+      description: "初めてノートを投稿した"
+      flavor: "良いMisskeyライフを！"
+    _notes10:
+      title: "いくつかのノート"
+      description: "ノートを10回投稿した"
+    _notes100:
+      title: "たくさんのノート"
+      description: "ノートを100回投稿した"
+    _notes500:
+      title: "ノートまみれ"
+      description: "ノートを500回投稿した"
+    _notes1000:
+      title: "ノートの山"
+      description: "ノートを1,000回投稿した"
+    _notes5000:
+      title: "湧き出るノート"
+      description: "ノートを5,000回投稿した"
+    _notes10000:
+      title: "スーパーノート"
+      description: "ノートを10,000回投稿した"
+    _notes20000:
+      title: "ニードモアノート"
+      description: "ノートを20,000回投稿した"
+    _notes30000:
+      title: "ノートノートノート"
+      description: "ノートを30,000回投稿した"
+    _notes40000:
+      title: "ノート工場"
+      description: "ノートを40,000回投稿した"
+    _notes50000:
+      title: "ノートの惑星"
+      description: "ノートを50,000回投稿した"
+    _notes60000:
+      title: "ノートクエーサー"
+      description: "ノートを60,000回投稿した"
+    _notes70000:
+      title: "ブラックノートホール"
+      description: "ノートを70,000回投稿した"
+    _notes80000:
+      title: "ノートギャラクシー"
+      description: "ノートを80,000回投稿した"
+    _notes90000:
+      title: "ノートバース"
+      description: "ノートを90,000回投稿した"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "ノートを100,000回投稿した"
+      flavor: "そんなに書くことある？"
+    _login3:
+      title: "ビギナーⅠ"
+      description: "通算ログイン日数が3日"
+      flavor: "今日からね僕は ミスキストってことで"
+    _login7:
+      title: "ビギナーⅡ"
+      description: "通算ログイン日数が7日"
+      flavor: "慣れてきましたか？"
+    _login15:
+      title: "ビギナーⅢ"
+      description: "通算ログイン日数が15日"
+    _login30:
+      title: "ミスキストⅠ"
+      description: "通算ログイン日数が30日"
+    _login60:
+      title: "ミスキストⅡ"
+      description: "通算ログイン日数が60日"
+    _login100:
+      title: "ミスキストⅢ"
+      description: "通算ログイン日数が100日"
+      flavor: "そのユーザー、ミスキストにつき"
+    _login200:
+      title: "常連Ⅰ"
+      description: "通算ログイン日数が200日"
+    _login300:
+      title: "常連Ⅱ"
+      description: "通算ログイン日数が300日"
+    _login400:
+      title: "常連Ⅲ"
+      description: "通算ログイン日数が400日"
+    _login500:
+      title: "ベテランⅠ"
+      description: "通算ログイン日数が500日"
+      flavor: "諸君、私はノートが好きだ"
+    _login600:
+      title: "ベテランⅡ"
+      description: "通算ログイン日数が600日"
+    _login700:
+      title: "ベテランⅢ"
+      description: "通算ログイン日数が700日"
+    _login800:
+      title: "ノートマスターⅠ"
+      description: "通算ログイン日数が800日"
+    _login900:
+      title: "ノートマスターⅡ"
+      description: "通算ログイン日数が900日"
+    _login1000:
+      title: "ノートマスターⅢ"
+      description: "通算ログイン日数が1,000日"
+      flavor: "Misskeyを使ってくれてありがとう！"
+    _noteClipped1:
+      title: "クリップせずにはいられないな"
+      description: "初めてノートをクリップした"
+    _noteFavorited1:
+      title: "星をみるひと"
+      description: "初めてノートをお気に入りに登録した"
+    _myNoteFavorited1:
+      title: "星が欲しい"
+      description: "自分のノートが他の人からお気に入りに登録された"
+    _profileFilled:
+      title: "準備万端"
+      description: "プロフィール設定を行った"
+    _markedAsCat:
+      title: "吾輩は猫である"
+      description: "アカウントをCatとして設定した"
+      flavor: "名前はまだない。"
+    _following1:
+      title: "はじめてのフォロー"
+      description: "初めてフォローした"
+    _following10:
+      title: "ついてく、ついてく"
+      description: "フォローが10人を超した"
+    _following50:
+      title: "友達たくさん"
+      description: "フォローが50人を超した"
+    _following100:
+      title: "友達100人"
+      description: "フォローが100人を超した"
+    _following300:
+      title: "友達過多"
+      description: "フォローが300人を超した"
+    _followers1:
+      title: "はじめてのフォロワー"
+      description: "初めてフォローされた"
+    _followers10:
+      title: "フォローミー！"
+      description: "フォロワーが10人を超した"
+    _followers50:
+      title: "ぞろぞろ"
+      description: "フォロワーが50人を超した"
+    _followers100:
+      title: "人気者"
+      description: "フォロワーが100人を超した"
+    _followers300:
+      title: "一列でお並びください"
+      description: "フォロワーが300人を超した"
+    _followers500:
+      title: "基地局"
+      description: "フォロワーが500人を超した"
+    _followers1000:
+      title: "インフルエンサー"
+      description: "フォロワーが1,000人を超した"
+    _collectAchievements30:
+      title: "実績コレクター"
+      description: "実績を30個以上獲得した"
+    _viewAchievements3min:
+      title: "実績好き"
+      description: "実績一覧を3分以上眺め続けた"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "\"I ❤ #Misskey\"を投稿した"
+      flavor: "Misskeyを使ってくださりありがとうございます！ by 開発チーム"
+    _foundTreasure:
+      title: "宝探し"
+      description: "隠されたお宝を発見した"
+    _client30min:
+      title: "ひとやすみ"
+      description: "クライアントを起動してから30分以上経過した"
+    _noteDeletedWithin1min:
+      title: "いまのなし"
+      description: "投稿してから1分以内にその投稿を削除した"
+    _postedAtLateNight:
+      title: "夜行性"
+      description: "深夜にノートを投稿した"
+      flavor: "そろそろ寝よう。"
+    _postedAt0min0sec:
+      title: "時報"
+      description: "0分0秒にノートを投稿した"
+      flavor: "ポッ ポッ ポッ ピーン"
+    _selfQuote:
+      title: "自己言及"
+      description: "自分のノートを引用した"
+    _htl20npm:
+      title: "流れるTL"
+      description: "ホームタイムラインの流速が20npmを越す"
+    _viewInstanceChart:
+      title: "アナリスト"
+      description: "インスタンスのチャートを表示した"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "スクラッチパッドで hello world を出力した"
+    _open3windows:
+      title: "マルチウィンドウ"
+      description: "ウィンドウを3つ以上開いた状態にした"
+    _driveFolderCircularReference:
+      title: "循環参照"
+      description: "ドライブのフォルダを再帰的な入れ子にしようとした"
+    _reactWithoutRead:
+      title: "ちゃんと読んだ？"
+      description: "100文字以上のテキストを含むノートに投稿されてから3秒以内にリアクションした"
+    _clickedClickHere:
+      title: "ここをクリック"
+      description: "ここをクリックした"
+    _justPlainLucky:
+      title: "単なるラッキー"
+      description: "10秒ごとに0.005%の確率で獲得"
+    _setNameToSyuilo:
+      title: "神様コンプレックス"
+      description: "名前を syuilo に設定した"
+    _passedSinceAccountCreated1:
+      title: "一周年"
+      description: "アカウント作成から1年経過した"
+    _passedSinceAccountCreated2:
+      title: "二周年"
+      description: "アカウント作成から2年経過した"
+    _passedSinceAccountCreated3:
+      title: "三周年"
+      description: "アカウント作成から3年経過した"
+    _loggedInOnBirthday:
+      title: "ハッピーバースデー"
+      description: "誕生日にログインした"
+    _loggedInOnNewYearsDay:
+      title: "あけましておめでとうございます"
+      description: "元日にログインした"
+      flavor: "今年も弊インスタンスをよろしくお願いします"
+    _cookieClicked:
+      title: "クッキーをクリックするゲーム"
+      description: "クッキーをクリックした"
+      flavor: "ソフト間違ってない？"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Brain Diverへのリンクを投稿した"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 
 _role:
   new: "ロールの作成"
@@ -940,7 +1195,7 @@ _role:
   description: "ロールの説明"
   permission: "ロールの権限"
   descriptionOfPermission: "<b>モデレーター</b>は基本的なモデレーションに関する操作を行えます。\n<b>管理者</b>はインスタンスの全ての設定を変更できます。"
-  assignTarget: "アサインターゲット"
+  assignTarget: "アサイン"
   descriptionOfAssignTarget: "<b>マニュアル</b>は誰がこのロールに含まれるかを手動で管理します。\n<b>コンディショナル</b>は条件を設定し、それに合致するユーザーが自動で含まれるようになります。"
   manual: "マニュアル"
   conditional: "コンディショナル"
@@ -949,11 +1204,20 @@ _role:
   isPublic: "ロールを公開"
   descriptionOfIsPublic: "ロールにアサインされたユーザーを誰でも見ることができます。また、ユーザーのプロフィールでこのロールが表示されます。"
   options: "オプション"
+  policies: "ポリシー"
   baseRole: "ベースロール"
   useBaseValue: "ベースロールの値を使用"
   chooseRoleToAssign: "アサインするロールを選択"
+  iconUrl: "アイコン画像のURL"
+  asBadge: "バッジとして表示"
+  descriptionOfAsBadge: "オンにすると、ユーザー名の横にロールのアイコンが表示されます。"
   canEditMembersByModerator: "モデレーターのメンバー編集を許可"
   descriptionOfCanEditMembersByModerator: "オンにすると、管理者に加えてモデレーターもこのロールへユーザーをアサイン/アサイン解除できるようになります。オフにすると管理者のみが行えます。"
+  priority: "優先度"
+  _priority:
+    low: "低"
+    middle: "中"
+    high: "高"
   _options:
     gtlAvailable: "グローバルタイムラインの閲覧"
     ltlAvailable: "ローカルタイムラインの閲覧"
@@ -961,9 +1225,17 @@ _role:
     canInvite: "インスタンス招待コードの発行"
     canManageCustomEmojis: "カスタム絵文字の管理"
     driveCapacity: "ドライブ容量"
+    pinMax: "ノートのピン留めの最大数"
     antennaMax: "アンテナの作成可能数"
     wordMuteMax: "ワードミュートの最大文字数"
     webhookMax: "Webhookの作成可能数"
+    clipMax: "クリップの作成可能数"
+    noteEachClipsMax: "クリップ内のノートの最大数"
+    userListMax: "ユーザーリストの作成可能数"
+    userEachUserListsMax: "ユーザーリスト内のユーザーの最大数"
+    rateLimitFactor: "レートリミット"
+    descriptionOfRateLimitFactor: "小さいほど制限が緩和され、大きいほど制限が強化されます。"
+    canHideAds: "広告の非表示"
   _condition:
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
@@ -1014,6 +1286,7 @@ _accountDelete:
 _ad:
   back: "戻る"
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"
+  hide: "表示しない"
 
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
@@ -1078,73 +1351,6 @@ _nsfw:
   ignore: "閲覧注意のメディアを隠さない"
   force: "常にメディアを隠す"
 
-_mfm:
-  cheatSheet: "MFMチートシート"
-  intro: "MFMは、Misskey内の様々な場所で使用できる専用のマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
-  dummy: "MisskeyでFediverseの世界が広がります"
-  mention: "メンション"
-  mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示すことができます。"
-  hashtag: "ハッシュタグ"
-  hashtagDescription: "ナンバーサイン + タグで、ハッシュタグを示すことができます。"
-  url: "URL"
-  urlDescription: "URLを示すことができます。"
-  link: "リンク"
-  linkDescription: "文章の特定の範囲を、URLに紐づけることができます。"
-  bold: "太字"
-  boldDescription: "文字を太く表示して強調することができます。"
-  small: "目立たなく"
-  smallDescription: "内容を小さく・薄く表示させることができます。"
-  center: "中央寄せ"
-  centerDescription: "内容を中央寄せで表示させることができます。"
-  inlineCode: "コード(インライン)"
-  inlineCodeDescription: "プログラムなどのコードをインラインでシンタックスハイライトします。"
-  blockCode: "コード(ブロック)"
-  blockCodeDescription: "複数行のプログラムなどのコードをブロックでシンタックスハイライトします。"
-  inlineMath: "数式(インライン)"
-  inlineMathDescription: "数式(KaTeX)をインラインで表示します。"
-  blockMath: "数式(ブロック)"
-  blockMathDescription: "複数行の数式(KaTeX)をブロックで表示します。"
-  quote: "引用"
-  quoteDescription: "内容が引用であることを示すことができます。"
-  emoji: "カスタム絵文字"
-  emojiDescription: "コロンでカスタム絵文字名を囲むと、カスタム絵文字を表示させることができます。"
-  search: "検索"
-  searchDescription: "入力済み検索ボックスを表示させることができます。"
-  flip: "反転"
-  flipDescription: "内容を上下または左右に反転させます。"
-  jelly: "アニメーション(びよんびよん)"
-  jellyDescription: "びよんびよんするアニメーションを与えます。"
-  tada: "アニメーション(じゃーん)"
-  tadaDescription: "ジャーン！という感じのアニメーションを与えます。"
-  jump: "アニメーション(ジャンプ)"
-  jumpDescription: "飛び跳ねるようなアニメーションを与えます。"
-  bounce: "アニメーション(バウンド)"
-  bounceDescription: "ぽよんぽよん弾むようなアニメーションを与えます。"
-  shake: "アニメーション(ぶるぶる)"
-  shakeDescription: "ぶるぶる震えるアニメーションを与えます。"
-  twitch: "アニメーション(ブレ)"
-  twitchDescription: "激しくブレるアニメーションを与えます。"
-  spin: "アニメーション(回転)"
-  spinDescription: "回転するアニメーションを与えます。"
-  x2: "大きく"
-  x2Description: "内容を大きく表示します。"
-  x3: "とても大きく"
-  x3Description: "内容をとても大きく表示します。"
-  x4: "究極に大きく"
-  x4Description: "内容を究極に大きく表示します。"
-  blur: "ぼかし"
-  blurDescription: "内容をぼかすことができます。ポインターを上に乗せるとはっきり見えるようになります。"
-  font: "フォント"
-  fontDescription: "内容のフォントを指定することができます。"
-  rainbow: "レインボー"
-  rainbowDescription: "内容をレインボーにします。"
-  sparkle: "キラキラ"
-  sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
-  rotate: "回転"
-  rotateDescription: "指定した角度で回転させます。"
-  plain: "プレーン"
-  plainDescription: "内側の構文を全て無効にします。"
-
 _instanceTicker:
   none: "表示しない"
   remote: "リモートユーザーに表示"
@@ -1319,14 +1525,29 @@ _tutorial:
 
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"
-  registerDevice: "デバイスを登録"
-  registerKey: "キーを登録"
+  registerTOTP: "認証アプリの設定を開始"
+  passwordToTOTP: "パスワードを入力してください"
   step1: "まず、{a}や{b}などの認証アプリをお使いのデバイスにインストールします。"
   step2: "次に、表示されているQRコードをアプリでスキャンします。"
-  step2Url: "デスクトップアプリでは次のURLを入力します:"
-  step3: "アプリに表示されているトークンを入力して完了です。"
-  step4: "これからログインするときも、同じようにトークンを入力します。"
-  securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーもしくは端末の指紋認証やPINを使用してログインするように設定できます。"
+  step2Click: "QRコードをクリックすると、お使いの端末にインストールされている認証アプリやキーリングに登録できます。"
+  step2Url: "デスクトップアプリでは次のURIを入力します:"
+  step3Title: "確認コードを入力"
+  step3: "アプリに表示されている確認コード（トークン）を入力して完了です。"
+  step4: "これからログインするときも、同じように確認コードを入力します。"
+  securityKeyNotSupported: "お使いのブラウザはセキュリティキーに対応していません。"
+  registerTOTPBeforeKey: "セキュリティキー・パスキーを登録するには、まず認証アプリの設定を行なってください。"
+  securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキー、端末の生体認証やPINロック、パスキーといった、WebAuthn由来の鍵を登録します。"
+  chromePasskeyNotSupported: "Chromeのパスキーは現在サポートしていません。"
+  registerSecurityKey: "セキュリティキー・パスキーを登録する"
+  securityKeyName: "キーの名前を入力"
+  tapSecurityKey: "ブラウザの指示に従い、セキュリティキーやパスキーを登録してください"
+  removeKey: "セキュリティキーを削除"
+  removeKeyConfirm: "{name}を削除しますか？"
+  whyTOTPOnlyRenew: "セキュリティキーが登録されている場合、認証アプリの設定は解除できません。"
+  renewTOTP: "認証アプリを再設定"
+  renewTOTPConfirm: "今までの認証アプリの確認コードは使用できなくなります"
+  renewTOTPOk: "再設定する"
+  renewTOTPCancel: "やめておく"
 
 _permissions:
   "read:account": "アカウントの情報を見る"
@@ -1363,19 +1584,21 @@ _permissions:
   "write:gallery-likes": "ギャラリーのいいねを操作する"
 
 _auth:
+  shareAccessTitle: "アプリへのアクセス許可"
   shareAccess: "「{name}」がアカウントにアクセスすることを許可しますか？"
   shareAccessAsk: "アカウントへのアクセスを許可しますか？"
+  permission: "{name}は次の権限を要求しています"
   permissionAsk: "このアプリは次の権限を要求しています"
   pleaseGoBack: "アプリケーションに戻ってやっていってください"
   callback: "アプリケーションに戻っています"
   denied: "アクセスを拒否しました"
+  pleaseLogin: "アプリケーションにアクセス許可を与えるには、ログインが必要です。"
 
 _antennaSources:
   all: "全てのノート"
   homeTimeline: "フォローしているユーザーのノート"
   users: "指定した一人または複数のユーザーのノート"
   userList: "指定したリストのユーザーのノート"
-  userGroup: "指定したグループのユーザーのノート"
 
 _weekday:
   sunday: "日曜日"
@@ -1455,8 +1678,8 @@ _visibility:
   followersDescription: "自分のフォロワーのみに公開"
   specified: "ダイレクト"
   specifiedDescription: "指定したユーザーのみに公開"
-  localOnly: "ローカルのみ"
-  localOnlyDescription: "リモートユーザーには非公開"
+  disableFederation: "連合なし"
+  disableFederationDescription: "他インスタンスへの配信を行いません"
 
 _postForm:
   replyPlaceholder: "このノートに返信..."
@@ -1605,15 +1828,13 @@ _notification:
   youGotReply: "{name}からのリプライ"
   youGotQuote: "{name}による引用"
   youRenoted: "{name}がRenoteしました"
-  youGotMessagingMessageFromUser: "{name}からのチャットがあります"
-  youGotMessagingMessageFromGroup: "{name}のチャットがあります"
   youWereFollowed: "フォローされました"
   youReceivedFollowRequest: "フォローリクエストが来ました"
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
-  youWereInvitedToGroup: "{userName}があなたをグループに招待しました"
   pollEnded: "アンケートの結果が出ました"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
+  achievementEarned: "実績を獲得"
 
   _types:
     all: "すべて"
@@ -1626,7 +1847,7 @@ _notification:
     pollEnded: "アンケートが終了"
     receiveFollowRequest: "フォロー申請を受け取った"
     followRequestAccepted: "フォローが受理された"
-    groupInvited: "グループに招待された"
+    achievementEarned: "実績の獲得"
     app: "連携アプリからの通知"
 
   _actions:
@@ -1659,5 +1880,10 @@ _deck:
     tl: "タイムライン"
     antenna: "アンテナ"
     list: "リスト"
+    channel: "チャンネル"
     mentions: "あなた宛て"
     direct: "ダイレクト"
+
+_dialog:
+  charactersExceeded: "最大文字数を超えています！ 現在 {current} / 制限 {max}"
+  charactersBelow: "最小文字数を下回っています！ 現在 {current} / 制限 {min}"

locales/ja-KS.yml

@@ -8,9 +8,9 @@ search: "探す"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
-forgotPassword: "パスワード忘れてん"
+forgotPassword: "パスワード忘れてもうた"
 fetchingAsApObject: "今ちと連合に照会しとるで"
-ok: "OKや"
+ok: "ええで"
 gotIt: "ほい"
 cancel: "やめとく"
 noThankYou: "やめとく"
@@ -46,7 +46,7 @@ copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
 delete: "ほかす"
 deleteAndEdit: "ほかして直す"
-deleteAndEditConfirm: "このノートをほかして書き直すんか？このノートへのリアクション、Renote、返信も全部消えてまうで。"
+deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのリアクション、Renote、返信も全部消えるんやけどそれでもええん？"
 addToList: "リストに入れたる"
 sendMessage: "メッセージを送る"
 copyRSS: "RSSをコピー"
@@ -67,7 +67,7 @@ import: "インポート"
 export: "エクスポート"
 files: "ファイル"
 download: "ダウンロード"
-driveFileDeleteConfirm: "ファイル「{name}」を消してしもうてええか？このファイルを添付したノートも消えてまうで。"
+driveFileDeleteConfirm: "ファイル「{name}」をほかしてええか？このファイルを添付したノートも消えてまうで。"
 unfollowConfirm: "{name}のフォローを解除してもええんか？"
 exportRequested: "エクスポートしてな、ってリクエストしたけど、これ多分めっちゃ時間かかるで。エクスポート終わったら「ドライブ」に突っ込んどくで。"
 importRequested: "インポートしてな、ってリクエストしたけど、これ多分めっちゃ時間かかるで。"
@@ -83,13 +83,13 @@ manageLists: "リストの管理"
 error: "エラー"
 somethingHappened: "なんかアカンことが起こったで"
 retry: "もっぺんやる？"
-pageLoadError: "ページの読み込みに失敗してしもうたで…"
+pageLoadError: "ページの読み込みに失敗してもうたわ…"
 pageLoadErrorDescription: "これは普通、ネットワークかブラウザキャッシュが原因やからね。キャッシュをクリアするか、もうちっとだけ待ってくれへんか？"
 serverIsDead: "サーバーからの応答がないで。もうちょい待ってから試してみてな。"
 youShouldUpgradeClient: "このページを表示するには、リロードして新しいバージョンのクライアントを使ってなー。"
 enterListName: "リスト名を入れてや"
 privacy: "プライバシー"
-makeFollowManuallyApprove: "自分が認めた人だけがこのアカウントをフォローできるようにする"
+makeFollowManuallyApprove: "他人のフォローは許可してからや！"
 defaultNoteVisibility: "もとからの公開範囲"
 follow: "フォロー"
 followRequest: "フォローを頼む"
@@ -103,6 +103,8 @@ renoted: "Renoteしたで。"
 cantRenote: "この投稿はRenoteできへんらしい。"
 cantReRenote: "Renote自体はRenoteできへんで。"
 quote: "引用"
+inChannelRenote: "チャンネル内Renote"
+inChannelQuote: "チャンネル内引用"
 pinnedNote: "ピン留めされとるノート"
 pinned: "ピン留めしとく"
 you: "あんた"
@@ -110,6 +112,7 @@ clickToShow: "押したら見えるで"
 sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
+reactions: "リアクション"
 reactionSetting: "Reaction that will be displayed in Picker. "
 reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
 rememberNoteVisibility: "公開範囲覚えといて"
@@ -128,6 +131,7 @@ unblockConfirm: "ブロックやめたるってほんまか？"
 suspendConfirm: "凍結してしもうてええか？"
 unsuspendConfirm: "解凍するけどええか？"
 selectList: "リストを選ぶ"
+selectChannel: "チャンネルを選ぶ"
 selectAntenna: "アンテナを選ぶ"
 selectWidget: "ウィジェットを選ぶ"
 editWidgets: "ウィジェットをいじる"
@@ -149,7 +153,7 @@ flagShowTimelineReplies: "タイムラインにノートへの返信を表示す
 flagShowTimelineRepliesDescription: "オンにしたら、タイムラインにユーザーのノートの他にもそのユーザーの他のノートへの返信を表示するで。"
 autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストを勝手に許可しとく"
 addAccount: "アカウントを追加"
-loginFailed: "ログインに失敗してしもうた…"
+loginFailed: "ログインに失敗してもうた…"
 showOnRemote: "リモートで見る"
 general: "全般"
 wallpaper: "壁紙"
@@ -241,7 +245,7 @@ resetAreYouSure: "リセットしてええん？"
 saved: "保存したで！"
 messaging: "チャット"
 upload: "アップロード"
-keepOriginalUploading: "オリジナル画像を保持するで"
+keepOriginalUploading: "オリジナル画像を保持するわ"
 keepOriginalUploadingDescription: "画像を上げるときにオリジナル版を保持するで。オフにしたら上げたときにブラウザでWeb公開用の画像を生成するで。 "
 fromDrive: "ドライブから"
 fromUrl: "URLから"
@@ -255,6 +259,8 @@ noMoreHistory: "これより過去の履歴はあらへんで"
 startMessaging: "チャットやるで"
 nUsersRead: "{n}人が読んでもうた"
 agreeTo: "{0}に同意したで"
+agreeBelow: "下記に同意したる"
+basicNotesBeforeCreateAccount: "よう読んでやってや"
 tos: "利用規約"
 start: "始める"
 home: "ホーム"
@@ -299,7 +305,7 @@ avatar: "アイコン"
 banner: "バナー"
 nsfw: "閲覧注意"
 whenServerDisconnected: "サーバーとの接続が切れたとき"
-disconnectedFromServer: "サーバーとの通信が切れたで"
+disconnectedFromServer: "サーバーが機嫌悪いねん"
 reload: "リロード"
 doNothing: "何もせんとく"
 reloadConfirm: "リロードしてええか？"
@@ -387,13 +393,10 @@ about: "情報"
 aboutMisskey: "Misskeyってなんや？"
 administrator: "管理者"
 token: "トークン"
-twoStepAuthentication: "二段階認証"
 moderator: "モデレーター"
 moderation: "モデレーション"
 nUsersMentioned: "{n}人が投稿"
 securityKey: "セキュリティキー"
-securityKeyName: "キーの名前"
-registerSecurityKey: "セキュリティキーを登録するで"
 lastUsed: "最後につこうた日"
 unregister: "登録やめる"
 passwordLessLogin: "パスワード無くてもログインできるようにする"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "チャットはもうぜんぶ読んだわっ"
 help: "ヘルプ"
 inputMessageHere: "ここにメッセージ書いてや"
 close: "閉じる"
-group: "グループ"
-groups: "グループ"
-createGroup: "グループを作るで"
-ownedGroups: "所有しとるグループ"
-joinedGroups: "参加しとるグループ"
 invites: "来てや"
-groupName: "グループ名"
 members: "メンバー"
 transfer: "譲渡"
-messagingWithUser: "ユーザーとチャット"
-messagingWithGroup: "グループでチャット"
 title: "タイトル"
 text: "テキスト"
 enable: "有効にするで"
 next: "次"
 retype: "もっかい入力"
 noteOf: "{user}のノート"
-inviteToGroup: "グループに招く"
 quoteAttached: "引用付いとるで"
 quoteQuestion: "引用として添付してもええか？"
 noMessagesYet: "まだチャットはあらへんで"
@@ -450,20 +444,17 @@ passwordMatched: "よし！一致や！"
 passwordNotMatched: "一致しとらんで？"
 signinWith: "{x}でログイン"
 signinFailed: "ログインできんかったで。もっかいユーザー名とパスワードを確認してみてな。"
-tapSecurityKey: "セキュリティキーにタッチしてな"
 or: "それか"
 language: "言語"
 uiLanguage: "UIの表示言語"
-groupInvited: "グループに招待されとるで"
 aboutX: "{x}について"
 emojiStyle: "絵文字のスタイル"
 native: "ネイティブ"
 disableDrawer: "メニューをドロワーで表示せぇへん"
-youHaveNoGroups: "グループがあらへんねぇ。"
-joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループ作ってからやってな"
 noHistory: "履歴はあらへんねぇ。"
 signinHistory: "ログイン履歴"
-disableAnimatedMfm: "動きがやかましいMFMを止める"
+enableAdvancedMfm: "ややこしいMFMもありにする"
+enableAnimatedMfm: "動きがやかましいMFMも許したる"
 doing: "やっとるがな"
 category: "カテゴリ"
 tags: "タグ"
@@ -607,7 +598,7 @@ wordMute: "ワードミュート"
 regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが出てきたで:"
 instanceMute: "インスタンスミュート"
-userSaysSomething: "{name}が何か言ったようやで"
+userSaysSomething: "{name}が何か言うとるわ"
 makeActive: "使うで"
 display: "表示"
 copy: "コピー"
@@ -672,8 +663,8 @@ sentReactionsCount: "リアクションした数やで"
 receivedReactionsCount: "リアクションされた数"
 pollVotesCount: "アンケートに投票した数"
 pollVotedCount: "アンケートに投票された数"
-yes: "はい"
-no: "いいえ"
+yes: "ええで"
+no: "あかんで"
 driveFilesCount: "ドライブのファイル数"
 driveUsage: "ドライブ使用量やで"
 noCrawle: "クローラーによるインデックスを拒否するで"
@@ -833,10 +824,8 @@ deleteAccountConfirm: "アカウントを消すで？ええんか？"
 incorrectPassword: "パスワードがちゃうで。"
 voteConfirm: "「{choice}」に投票するんか？"
 hide: "隠す"
-leaveGroup: "グループから抜けるで"
-leaveGroupConfirm: "「{name}」から抜けるん？"
 useDrawerReactionPickerForMobile: "ケータイとかのときドロワーで表示するで"
-welcomeBackWithName: "まいど、{name}さん"
+welcomeBackWithName: "まいど、{name}はん"
 clickToFinishEmailVerification: "[{ok}]を押してメアドの確認を終わらせてなー"
 overridedDeviceKind: "デバイスタイプ"
 smartphone: "スマホ"
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "アカウントの取得に失敗したみた
 rateLimitExceeded: "レート制限が超えたみたいやで"
 cropImage: "画像のクロップ"
 cropImageAsk: "画像をクロップしたってええか？"
+cropYes: "切り抜いたる"
+cropNo: "切り抜かへん"
 file: "ファイル"
 recentNHours: "直近{n}時間"
 recentNDays: "直近{n}日"
@@ -891,7 +882,7 @@ fast: "速い"
 sensitiveMediaDetection: "センシティブなメディアの検出"
 localOnly: "ローカルのみ"
 remoteOnly: "リモートのみ"
-failedToUpload: "アップロードに失敗したで"
+failedToUpload: "アップロードに失敗してもうたわ…"
 cannotUploadBecauseInappropriate: "不適切な内容を含むかもしれへんって判定されたでアップロードできまへん。"
 cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いでアップロードできまへん。"
 beta: "ベータ"
@@ -926,29 +917,297 @@ didYouLikeMisskey: "Misskeyを気に入っとっただけましたん？"
 pleaseDonate: "Misskeyは{host}が使用している無料のソフトウェアやで。これからも開発を続けれるように、寄付したってな～。"
 roles: "ロール"
 role: "ロール"
+normalUser: "一般ユーザー"
 undefined: "未定義"
 assign: "アサイン"
 unassign: "アサインを解除"
 color: "色"
+manageCustomEmojis: "カスタム絵文字の管理"
+youCannotCreateAnymore: "これ以上作れなさそうや"
+cannotPerformTemporary: "一時的に利用できへんで"
+cannotPerformTemporaryDescription: "操作回数が制限を超えたから一時的に利用できへんくなったで。ちょっと時間置いてからもう一回やってやー。"
+preset: "プリセット"
+selectFromPresets: "プリセットから選ぶ"
+achievements: "実績"
+gotInvalidResponseError: "サーバー黙っとるわ、知らんけど"
+gotInvalidResponseErrorDescription: "サーバーいま日曜日。またきて月曜日。"
+thisPostMayBeAnnoying: "この投稿は迷惑かもしらんで。"
+thisPostMayBeAnnoyingHome: "ホームに投稿"
+thisPostMayBeAnnoyingCancel: "やめとく"
+thisPostMayBeAnnoyingIgnore: "このまま投稿"
+collapseRenotes: "見たことあるRenoteは省略やで"
+internalServerError: "サーバー内部エラー"
+internalServerErrorDescription: "サーバー内部でよう分からんエラーやわ"
+copyErrorInfo: "エラー情報をコピー"
+_achievements:
+  earnedAt: "貰った日ぃ"
+  _types:
+    _notes1:
+      title: "まいど！"
+      description: "初めてノート投稿したった"
+      flavor: "Misskeyを楽しんでな～"
+    _notes10:
+      title: "ノートの天保山"
+      description: "ノートを10回投稿した"
+    _notes100:
+      title: "ノートの真田山"
+      description: "ノートを100回投稿した"
+    _notes500:
+      title: "ノートの生駒山"
+      description: "ノートを500回投稿した"
+    _notes1000:
+      title: "ノートの山"
+      description: "ノートを1,000回投稿した"
+    _notes5000:
+      title: "箕面の滝からノート"
+      description: "ノートを5,000回投稿した"
+    _notes10000:
+      title: "スーパーノート"
+      description: "ノートを10,000回投稿した"
+    _notes20000:
+      title: "ニードモアノート"
+      description: "ノートを20,000回投稿した"
+    _notes30000:
+      title: "ノートノートノート"
+      description: "ノートを30,000回投稿した"
+    _notes40000:
+      title: "ノート工場"
+      description: "ノートを40,000回投稿した"
+    _notes50000:
+      title: "ノートの惑星"
+      description: "ノートを50,000回投稿した"
+    _notes60000:
+      title: "ノートクエーサー"
+      description: "ノートを60,000回投稿した"
+    _notes70000:
+      title: "ブラックノートホール"
+      description: "ノートを70,000回投稿した"
+    _notes80000:
+      title: "ノートギャラクシー"
+      description: "ノートを80,000回投稿した"
+    _notes90000:
+      title: "ノートバース"
+      description: "ノートを90,000回投稿した"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "ノートを100,000回投稿した"
+      flavor: "そんなに書くことあるんか？"
+    _login3:
+      title: "ビギナーⅠ"
+      description: "通算3日ログインした"
+      flavor: "今日からワシはミスキストやで"
+    _login7:
+      title: "ビギナーⅡ"
+      description: "通算7日ログインした"
+      flavor: "慣れてきたんちゃう？"
+    _login15:
+      title: "ビギナーⅢ"
+      description: "通算15日ログインした"
+    _login30:
+      title: "ミスキストⅠ"
+      description: "通算30日ログインした"
+    _login60:
+      title: "ミスキストⅡ"
+      description: "通算60日ログインした"
+    _login100:
+      title: "ミスキストⅢ"
+      description: "通算100日ログインした"
+      flavor: "そのユーザー、ミスキストにつき"
+    _login200:
+      title: "常連さんⅠ"
+      description: "通算200日ログインした"
+    _login300:
+      title: "常連さんⅡ"
+      description: "通算300日ログインした"
+    _login400:
+      title: "常連さんⅢ"
+      description: "通算400日ログインした"
+    _login500:
+      title: "ベテランさんⅠ"
+      description: "通算500日ログインした"
+      flavor: "あんたら、うちはノートが好きや"
+    _login600:
+      title: "ベテランさんⅡ"
+      description: "通算600日ログインした"
+    _login700:
+      title: "ベテランさんⅢ"
+      description: "通算700日ログインした"
+    _login800:
+      title: "ノートマイスターⅠ"
+      description: "通算800日ログインした"
+    _login900:
+      title: "ノートマイスターⅡ"
+      description: "通算900日ログインした"
+    _login1000:
+      title: "ノートマイスターⅢ"
+      description: "通算1,000日ログインした"
+      flavor: "Misskeyようさん使てもろておおきにな！"
+    _noteClipped1:
+      title: "アカンどれもクリップしたいわ"
+      description: "初めてノートをクリップした"
+    _noteFavorited1:
+      title: "星ぃみるひと"
+      description: "初めてノートをお気に入りに登録した"
+    _myNoteFavorited1:
+      title: "星ぃ欲しい"
+      description: "ワレのノートが他のひとにお気に入り登録されたで"
+    _following10:
+      description: "フォローが10人超えた"
+    _following50:
+      description: "フォローが50人超えた"
+    _following100:
+      description: "フォローが100人超えた"
+    _following300:
+      description: "フォローが300人超えた"
+    _followers10:
+      description: "フォロワーが10人超えた"
+    _followers50:
+      description: "フォロワーが50人超えた"
+    _followers100:
+      description: "フォロワーが100人超えた"
+    _followers300:
+      description: "フォロワーが300人超えた"
+    _followers500:
+      title: "基地局"
+      description: "フォロワーが500人超えた"
+    _followers1000:
+      title: "インフルエンサー"
+      description: "フォロワーが1,000人超えた"
+    _collectAchievements30:
+      title: "実績コレクター"
+      description: "実績を30個以上獲得した"
+    _viewAchievements3min:
+      title: "実績好き"
+      description: "実績一覧を3分以上眺め続けた"
+    _iLoveMisskey:
+      title: "Misskey好きやねん"
+      description: "\"I ❤ #Misskey\"を投稿した"
+      flavor: "Misskeyを使ってくれてありがとうな～　by 開発チーム"
+    _foundTreasure:
+      title: "なんでも鑑定団"
+      description: "隠されたお宝を発見した"
+    _client30min:
+      title: "ねんね"
+      description: "クライアントを起動してから30分以上経過した"
+    _noteDeletedWithin1min:
+      title: "＊おおっと＊"
+      description: "投稿してから1分以内にその投稿を消した"
+    _postedAtLateNight:
+      title: "夜行性"
+      description: "深夜にノートを投稿した"
+      flavor: "そろそろ寝よか"
+    _postedAt0min0sec:
+      title: "時報"
+      description: "0分0秒にノートを投稿した"
+      flavor: "ポッ ポッ ポッ ピーン"
+    _selfQuote:
+      title: "自己言及"
+      description: "自分のノートを引用した"
+    _htl20npm:
+      title: "流れるTL"
+      description: "ホームタイムラインの流速が20npmを超す"
+    _viewInstanceChart:
+      title: "アナリスト"
+      description: "インスタンスのチャートを表示した"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "スクラッチパッドで hello worldを出力した"
+    _open3windows:
+      title: "マド開けすぎ"
+      description: "ウィンドウを3つ以上開いた状態にした"
+    _driveFolderCircularReference:
+      title: "環状線"
+      description: "ドライブのフォルダを再帰的な入れ子にしようとした"
+    _reactWithoutRead:
+      title: "ちゃんと読んだんか？"
+      description: "100文字以上のテキストを含むノートに投稿されてから3秒以内にリアクションした"
+    _clickedClickHere:
+      title: "ここをクリック"
+      description: "ここをクリックした"
+    _justPlainLucky:
+      title: "単なるラッキー"
+      description: "10秒ごとに0.005％の確率で獲得"
+    _setNameToSyuilo:
+      title: "神様コンプレックス"
+      description: "名前を syuilo に設定した"
+    _passedSinceAccountCreated1:
+      title: "一周年"
+      description: "アカウント作成から1年経過した"
+    _passedSinceAccountCreated2:
+      title: "二周年"
+      description: "アカウント作成から2年経過した"
+    _passedSinceAccountCreated3:
+      title: "三周年"
+      description: "アカウント作成から3年経過した"
+    _loggedInOnBirthday:
+      title: "ハッピーバースデー！"
+      description: "誕生日にログインした"
+    _loggedInOnNewYearsDay:
+      title: "あけましておめでとうございます！"
+      description: "元旦にログインした"
+      flavor: "今年も弊インスタンスをよろしくお願いします"
+    _cookieClicked:
+      title: "クッキー叩くやつ"
+      description: "クッキー叩いてもうた"
+      flavor: "兄ちゃんソフト間違っとんで"
 _role:
   new: "ロールの作成"
   edit: "ロールの編集"
   name: "ロール名"
   description: "ロールの説明"
+  permission: "ロールの権限"
+  descriptionOfPermission: "<b>モデレーター</b>は基本的なモデレーションに関わる操作を行えるで。\n<b>管理者</b>はインスタンスの全ての設定を変更できるで。"
+  assignTarget: "アサインターゲット"
+  descriptionOfAssignTarget: "<b>マニュアル</b>は誰がこのロールに含まれてるかを手動で管理するで。\n<b>コンディショナル</b>は条件を設定して、それに合うユーザーが自動で含まれるようになるで。"
+  manual: "マニュアル"
+  conditional: "コンディショナル"
+  condition: "条件"
+  isConditionalRole: "これはコンディショナルロールやで"
   isPublic: "ロールを公開"
   descriptionOfIsPublic: "ロールにアサインされたユーザーを誰でも見ることができるで。そんで、ユーザーのプロフィールでこのロールが表示されるで。"
   options: "オプション"
+  policies: "ポリシー"
   baseRole: "ベースロール"
   useBaseValue: "ベースロールの値を使用"
   chooseRoleToAssign: "アサインするロールを選択"
+  descriptionOfAsBadge: "オンにすると、ユーザー名の横んとこにロールのアイコンが表示されるで。"
   canEditMembersByModerator: "モデレーターのメンバー編集を許可"
   descriptionOfCanEditMembersByModerator: "オンにすると、管理者に加えてモデレーターもこのロールへユーザーをアサイン/アサイン解除できるようになるで。オフにすると管理者のみが行えるで。"
+  priority: "優先度"
+  _priority:
+    low: "低い"
+    middle: "中"
+    high: "高い"
   _options:
     gtlAvailable: "グローバルタイムラインの閲覧"
     ltlAvailable: "ローカルタイムラインの閲覧"
     canPublicNote: "パブリック投稿の許可"
+    canInvite: "インスタンス招待コードの発行"
+    canManageCustomEmojis: "カスタム絵文字の管理"
     driveCapacity: "ドライブ容量"
+    pinMax: "ノートのピン留めの最大数"
     antennaMax: "アンテナの作成可能数"
+    wordMuteMax: "ワードミュートの最大文字数"
+    webhookMax: "Webhockの作成可能数"
+    clipMax: "クリップの作成可能数"
+    noteEachClipsMax: "クリップ内のノートの最大数"
+    userListMax: "ユーザーリストの作成可能数"
+    userEachUserListsMax: "ユーザーリスト内のユーザーの最大数"
+    rateLimitFactor: "レートリミット"
+    descriptionOfRateLimitFactor: "ちっちゃいほど制限が緩くなって、大きいほど制限されるで。"
+    canHideAds: "広告を表示させへん"
+  _condition:
+    isLocal: "ローカルユーザー"
+    isRemote: "リモートユーザー"
+    createdLessThan: "アカウント作成から～以内"
+    createdMoreThan: "アカウント作成から～経過"
+    followersLessThanOrEq: "フォロワー数が～以下"
+    followersMoreThanOrEq: "フォロワー数が～以上"
+    followingLessThanOrEq: "フォロー数が～以下"
+    followingMoreThanOrEq: "フォロー数が～以上"
+    and: "～かつ～"
+    or: "～または～"
+    not: "～ではない"
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出して、モデレーションに役立てることができるで。サーバーの負荷が少し増えてまうなあ。"
   sensitivity: "検出感度やで"
@@ -981,6 +1240,7 @@ _accountDelete:
 _ad:
   back: "戻る"
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げるで"
+  hide: "表示せん"
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスをここに入力してや。そのアドレス宛に、パスワードリセット用のリンクが送られるから待っててな～。"
   ifNoEmail: "メールアドレスを登録してへんのやったら、管理者まで教えてな～。"
@@ -1036,72 +1296,6 @@ _nsfw:
   respect: "閲覧注意のメディアは隠すで"
   ignore: "閲覧注意のメディアは隠さへんで"
   force: "常にメディアを隠すで"
-_mfm:
-  cheatSheet: "MFMチートシート"
-  intro: "MFMは、Misskey内の色んな所で使える専用のマークアップ言語やで。このページでMFMで使える構文一覧が確認できるで。"
-  dummy: "MisskeyでFediverseの世界が広がります"
-  mention: "メンション"
-  mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示すことができるで。"
-  hashtag: "ハッシュタグ"
-  hashtagDescription: "ナンバーサイン + タグで、ハッシュタグを示すことができるで。"
-  url: "URL"
-  urlDescription: "URLを示すことができるで。"
-  link: "リンク"
-  linkDescription: "文章の特定の範囲をURLに紐づけることができるで"
-  bold: "太字"
-  boldDescription: "文字を太く表示して強調することができるで"
-  small: "目立たなく"
-  smallDescription: "内容を小さく・薄く表示することができるで"
-  center: "中央寄せ"
-  centerDescription: "内容を中央寄せで表示することができるで"
-  inlineCode: "コード(インライン)"
-  inlineCodeDescription: "プログラムとかのコードをインラインでシンタックスハイライトするで"
-  blockCode: "コード(ブロック)"
-  blockCodeDescription: "複数行のプログラムとかのコードをブロックでシンタックスハイライトするで"
-  inlineMath: "数式(インライン)"
-  inlineMathDescription: "数式(KaTeX)をインラインで表示するで"
-  blockMath: "数式(ブロック)"
-  blockMathDescription: "複数行の数式(KaTeX)をブロックで表示するで"
-  quote: "引用"
-  quoteDescription: "内容が引用ってことを示すことができるで"
-  emoji: "カスタム絵文字"
-  emojiDescription: "コロンでカスタム絵文字名を囲んだると、カスタム絵文字を表示させることができるで"
-  search: "探す"
-  searchDescription: "入力済み検索ボックスを表示することができるで"
-  flip: "反転"
-  flipDescription: "内容を上下または左右に反転するで"
-  jelly: "アニメーション(びよんびよん)"
-  jellyDescription: "びよんびよんするアニメーションやな。"
-  tada: "アニメーション(じゃーん)"
-  tadaDescription: "ジャーン！ってな感じのアニメーションやな。"
-  jump: "アニメーション(ジャンプ)"
-  jumpDescription: "飛び跳ねるようなアニメーションやな。"
-  bounce: "アニメーション(バウンド)"
-  bounceDescription: "ぽよんぽよん弾むようなアニメーションやな。"
-  shake: "アニメーション(ぶるぶる)"
-  shakeDescription: "ぶるぶる震えるアニメーションやな。"
-  twitch: "アニメーション(ブレ)"
-  twitchDescription: "激しくブレるアニメーションやな。"
-  spin: "アニメーション(回転)"
-  spinDescription: "回転するアニメーションやな。"
-  x2: "大きく"
-  x2Description: "内容を大きく表示するで"
-  x3: "とても大きく"
-  x3Description: "内容をとても大きく表示するで"
-  x4: "究極に大きく"
-  x4Description: "内容を究極に大きく表示するで"
-  blur: "ぼかし"
-  blurDescription: "内容をぼかすことができるで。ポインターを上に乗せるとはっきり見えるようになるで"
-  font: "フォント"
-  fontDescription: "内容のフォントを指定することができるで"
-  rainbow: "レインボー"
-  rainbowDescription: "内容をレインボーにするで"
-  sparkle: "キラキラ"
-  sparkleDescription: "キラキラしたバーティ来るのエフェクトを追加するで"
-  rotate: "回転"
-  rotateDescription: "指定した角度で回転させるで"
-  plain: "プレーン"
-  plainDescription: "内側の構文を全部無効にするで"
 _instanceTicker:
   none: "表示せん"
   remote: "リモートユーザーに表示"
@@ -1264,14 +1458,14 @@ _tutorial:
   step8_3: "通知の設定はあとから変更できるで"
 _2fa:
   alreadyRegistered: "もう設定終わっとるわ。"
-  registerDevice: "デバイスを登録するで"
-  registerKey: "キーを登録するで"
   step1: "ほんなら、{a}や{b}とかの認証アプリを使っとるデバイスにインストールしてな。"
   step2: "次に、ここにあるQRコードをアプリでスキャンしてな～。"
   step2Url: "デスクトップアプリやったら次のURLを入力してや:"
   step3: "アプリに表示されているトークンを入力して終わりや。"
   step4: "これからログインするときも、同じようにトークンを入力するんやで"
   securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーか端末の指紋認証やPINを使ってログインするように設定できるで。"
+  removeKeyConfirm: "{name}を消すん？"
+  renewTOTPCancel: "やめとく"
 _permissions:
   "read:account": "アカウントの情報を見るで"
   "write:account": "アカウントの情報を変更するで"
@@ -1308,16 +1502,17 @@ _permissions:
 _auth:
   shareAccess: "「{name}」がアカウントにアクセスすることを許可してええか？"
   shareAccessAsk: "アカウントのアクセスを許可してもええか？"
+  permission: "{name}に次の権限つけたってやって"
   permissionAsk: "このアプリは次の権限を要求しとるで"
   pleaseGoBack: "アプリケーションに戻ってええよ"
   callback: "アプリケーションに戻っとるで"
   denied: "アクセスを拒否ったで"
+  pleaseLogin: "アプリにアクセスさせるんやったら、ログインしてや。"
 _antennaSources:
   all: "みんなのノート"
   homeTimeline: "フォローしとるユーザーのノート"
   users: "選らんだ一人か複数のユーザーのノート"
   userList: "選んだリストのユーザーのノート"
-  userGroup: "選んだグループのユーザーのノート"
 _weekday:
   sunday: "日曜日"
   monday: "月曜日"
@@ -1392,8 +1587,6 @@ _visibility:
   followersDescription: "自分のフォロワーのみに公開するで"
   specified: "ダイレクト"
   specifiedDescription: "選んだユーザーのみに公開するで"
-  localOnly: "ローカルのみ"
-  localOnlyDescription: "リモートユーザーには非公開にするで"
 _postForm:
   replyPlaceholder: "このノートに返信..."
   quotePlaceholder: "このノートを引用..."
@@ -1488,7 +1681,7 @@ _pages:
   viewPage: "ページを見る"
   like: "ええやん"
   unlike: "良くないわ"
-  my: "人気のページ"
+  my: "自分のページ"
   liked: "ええと思ったページ"
   featured: "人気"
   inspector: "インスペクター"
@@ -1531,15 +1724,13 @@ _notification:
   youGotReply: "{name}からのリプライ"
   youGotQuote: "{name}による引用"
   youRenoted: "{name}がRenoteしたみたいやで"
-  youGotMessagingMessageFromUser: "{name}からのチャットがあるで"
-  youGotMessagingMessageFromGroup: "{name}のチャットがあるで"
   youWereFollowed: "フォローされたで"
   youReceivedFollowRequest: "フォロー許可してほしいみたいやな"
   yourFollowRequestAccepted: "フォローさせてもろたで"
-  youWereInvitedToGroup: "グループに招待されとるで"
   pollEnded: "アンケートの結果が出たみたいや"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしといたで"
+  achievementEarned: "実績を獲得しとるで"
   _types:
     all: "すべて"
     follow: "フォロー"
@@ -1551,7 +1742,6 @@ _notification:
     pollEnded: "アンケートが終了したで"
     receiveFollowRequest: "フォロー許可してほしいみたいやで"
     followRequestAccepted: "フォローが受理されたで"
-    groupInvited: "グループに招待されたで"
     app: "連携アプリからの通知や"
   _actions:
     followBack: "フォローバック"
@@ -1581,5 +1771,6 @@ _deck:
     tl: "タイムライン"
     antenna: "アンテナ"
     list: "リスト"
+    channel: "チャンネル"
     mentions: "あんた宛て"
     direct: "ダイレクト"

locales/kab-KAB.yml

@@ -39,10 +39,8 @@ remove: "Kkes"
 connectService: "Qqen"
 userList: "Tibdarin"
 securityKey: "Tasarutt n tɣellist"
-securityKeyName: "Isem n tsarutt"
 signinRequired: "Ttxil jerred"
 signinWith: "Tuqqna s {x}"
-tapSecurityKey: "Sekcem tasarutt-ik·im n tɣellist"
 uiLanguage: "Tutlayt n wegrudem"
 accountSettings: "Iɣewwaṛen n umiḍan"
 plugins: "Izegrar"
@@ -61,10 +59,6 @@ account: "Imiḍan"
 _email:
   _follow:
     title: "Yeṭṭafaṛ-ik·em-id"
-_mfm:
-  mention: "Bder"
-  search: "Nadi"
-  font: "Tasefsit"
 _theme:
   keys:
     mention: "Bder"

locales/kn-IN.yml

@@ -64,8 +64,6 @@ file: "ಕಡತಗಳು"
 _email:
   _follow:
     title: "ಹಿಂಬಾಲಿಸಿದರು"
-_mfm:
-  search: "ಹುಡುಕು"
 _sfx:
   notification: "ಅಧಿಸೂಚನೆಗಳು"
 _widgets:

locales/ko-KR.yml

@@ -15,7 +15,7 @@ gotIt: "알겠어요"
 cancel: "취소"
 noThankYou: "나중에"
 enterUsername: "유저명 입력"
-renotedBy: "{user}님이 리노트"
+renotedBy: "{user}님의 리노트"
 noNotes: "노트가 없습니다"
 noNotifications: "표시할 알림이 없습니다"
 instance: "인스턴스"
@@ -103,6 +103,8 @@ renoted: "리노트했습니다"
 cantRenote: "이 게시물은 리노트 할 수 없습니다."
 cantReRenote: "리노트를 리노트 할 수 없습니다."
 quote: "인용"
+inChannelRenote: "채널 내 리노트"
+inChannelQuote: "채널 내 인용"
 pinnedNote: "고정해놓은 노트"
 pinned: "프로필에 고정"
 you: "당신"
@@ -110,6 +112,7 @@ clickToShow: "클릭하여 보기"
 sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
+reactions: "리액션"
 reactionSetting: "선택기에 표시할 리액션"
 reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
@@ -128,6 +131,7 @@ unblockConfirm: "이 계정의 차단을 해제하시겠습니까?"
 suspendConfirm: "이 계정을 정지하시겠습니까?"
 unsuspendConfirm: "이 계정의 정지를 해제하시겠습니까?"
 selectList: "리스트 선택"
+selectChannel: "채널 선택"
 selectAntenna: "안테나 선택"
 selectWidget: "위젯 선택"
 editWidgets: "위젯 편집"
@@ -255,6 +259,8 @@ noMoreHistory: "이것보다 과거의 기록이 없습니다"
 startMessaging: "대화 시작하기"
 nUsersRead: "{n}명이 읽음"
 agreeTo: "{0}에 동의"
+agreeBelow: "아래 내용에 동의합니다"
+basicNotesBeforeCreateAccount: "기본적인 주의사항"
 tos: "이용 약관"
 start: "시작하기"
 home: "홈"
@@ -387,13 +393,10 @@ about: "정보"
 aboutMisskey: "Misskey에 대하여"
 administrator: "관리자"
 token: "토큰"
-twoStepAuthentication: "2단계 인증"
 moderator: "모더레이터"
 moderation: "모더레이션"
 nUsersMentioned: "{n}명이 언급함"
 securityKey: "보안 키"
-securityKeyName: "키 이름"
-registerSecurityKey: "보안 키를 등록"
 lastUsed: "마지막 사용"
 unregister: "등록 해제"
 passwordLessLogin: "비밀번호 없이 로그인"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "모든 대화를 읽은 상태로 표시"
 help: "도움말"
 inputMessageHere: "여기에 메시지를 입력하세요"
 close: "닫기"
-group: "그룹"
-groups: "그룹"
-createGroup: "그룹 만들기"
-ownedGroups: "소유 그룹"
-joinedGroups: "참여중인 그룹"
 invites: "초대"
-groupName: "그룹명"
 members: "멤버"
 transfer: "양도"
-messagingWithUser: "유저와 대화하기"
-messagingWithGroup: "그룹끼리 대화하기"
 title: "제목"
 text: "텍스트"
 enable: "사용"
 next: "다음"
 retype: "다시 입력"
 noteOf: "{user}의 노트"
-inviteToGroup: "그룹에 초대하기"
 quoteAttached: "인용함"
 quoteQuestion: "인용해서 작성하시겠습니까?"
 noMessagesYet: "아직 대화가 없습니다"
@@ -450,20 +444,17 @@ passwordMatched: "일치합니다"
 passwordNotMatched: "일치하지 않습니다"
 signinWith: "{x}로 로그인"
 signinFailed: "로그인할 수 없습니다. 사용자명과 비밀번호를 확인하여 주십시오."
-tapSecurityKey: "보안 키를 터치"
 or: "혹은"
 language: "언어"
 uiLanguage: "UI 표시 언어"
-groupInvited: "그룹에 초대되었습니다"
 aboutX: "{x}에 대하여"
 emojiStyle: "이모지 스타일"
 native: "네이티브"
 disableDrawer: "드로어 메뉴를 사용하지 않기"
-youHaveNoGroups: "그룹이 없습니다"
-joinOrCreateGroup: "다른 그룹의 초대를 받거나, 직접 새 그룹을 만들어 보세요."
 noHistory: "기록이 없습니다"
 signinHistory: "로그인 기록"
-disableAnimatedMfm: "움직임이 있는 MFM을 비활성화"
+enableAdvancedMfm: "고급 MFM을 활성화"
+enableAnimatedMfm: "움직임이 있는 MFM을 활성화"
 doing: "잠시만요"
 category: "카테고리"
 tags: "태그"
@@ -833,8 +824,6 @@ deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다.
 incorrectPassword: "비밀번호가 올바르지 않습니다."
 voteConfirm: "\"{choice}\"에 투표하시겠습니까?"
 hide: "숨기기"
-leaveGroup: "그룹 나가기"
-leaveGroupConfirm: "\"{name}\"에서 나갈까요?"
 useDrawerReactionPickerForMobile: "모바일에서 드로어 메뉴로 표시"
 welcomeBackWithName: "환영합니다, {name}님"
 clickToFinishEmailVerification: "[{ok}]를 눌러 이메일 인증을 완료하세요."
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "계정 정보를 가져오지 못했습니다"
 rateLimitExceeded: "요청 제한 횟수를 초과하였습니다"
 cropImage: "이미지 자르기"
 cropImageAsk: "이미지를 자르시겠습니까?"
+cropYes: "잘라내기"
+cropNo: "그대로 사용"
 file: "파일"
 recentNHours: "최근 {n}시간"
 recentNDays: "최근 {n}일"
@@ -907,7 +898,7 @@ subscribePushNotification: "푸시 알림 켜기"
 unsubscribePushNotification: "푸시 알림 끄기"
 pushNotificationAlreadySubscribed: "푸시 알림이 이미 켜져 있습니다"
 pushNotificationNotSupported: "브라우저나 인스턴스에서 푸시 알림이 지원되지 않습니다"
-sendPushNotificationReadMessage: "푸시 알림이니 메시지를 읽으면 푸시 알림을 삭제합니다"
+sendPushNotificationReadMessage: "푸시 알림이나 메시지를 읽은 뒤 푸시 알림을 삭제"
 sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」이라는 알림이 잠깐 표시됩니다. 기기의 전력 소비량이 증가할 수 있습니다."
 windowMaximize: "최대화"
 windowRestore: "복구"
@@ -926,29 +917,324 @@ didYouLikeMisskey: "Misskey가 마음에 드시나요?"
 pleaseDonate: "{host}은(는) 무료 소프트웨어 Misskey를 사용합니다. 후원을 통해 저희의 개발이 이어질 수 있게 도와주세요!"
 roles: "역할"
 role: "역할"
+normalUser: "일반 사용자"
 undefined: "정의되지 않음"
 assign: "할당"
 unassign: "할당 취소"
 color: "색"
+manageCustomEmojis: "커스텀 이모지 관리"
+youCannotCreateAnymore: "더 이상 생성할 수 없습니다."
+cannotPerformTemporary: "일시적으로 사용할 수 없음"
+cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요."
+preset: "프리셋"
+selectFromPresets: "프리셋에서 선택"
+achievements: "도전 과제"
+gotInvalidResponseError: "서버의 응답이 올바르지 않습니다"
+gotInvalidResponseErrorDescription: " 서버가 다운되었거나 점검중일 가능성이 있습니다. 잠시후에 다시 시도해 주십시오."
+thisPostMayBeAnnoying: "이 게시물은 다른 유저에게 피해를 줄 가능성이 있습니다."
+thisPostMayBeAnnoyingHome: "홈에 게시"
+thisPostMayBeAnnoyingCancel: "그만두기"
+thisPostMayBeAnnoyingIgnore: "이대로 게시"
+collapseRenotes: "이미 본 리노트를 간략화하기"
+internalServerError: "내부 서버 오류"
+internalServerErrorDescription: "내부 서버에서 예기치 않은 오류가 발생했습니다."
+copyErrorInfo: "오류 정보 복사"
+_achievements:
+  earnedAt: "달성 일시"
+  _types:
+    _notes1:
+      title: "미스키 시작했는데요"
+      description: "첫 노트를 작성했습니다"
+      flavor: "Misskey에 오신 것을 환영합니다!"
+    _notes10:
+      title: "노트 조금"
+      description: "10개의 노트를 작성했습니다"
+    _notes100:
+      title: "노트 많이"
+      description: "100개의 노트를 작성했습니다"
+    _notes500:
+      title: "노트로 뒤덮여버렸어"
+      description: "500개의 노트를 작성했습니다"
+    _notes1000:
+      title: "노트만 산더미"
+      description: "1,000개의 노트를 작성했습니다"
+    _notes5000:
+      title: "노트가 어디서 솟아?"
+      description: "5,000개의 노트를 작성했습니다"
+    _notes10000:
+      title: "슈퍼 노트"
+      description: "10,000개의 노트를 작성했습니다"
+    _notes20000:
+      title: "노트 더 없어?"
+      description: "20,000개의 노트를 작성했습니다"
+    _notes30000:
+      title: "노트노트노트"
+      description: "30,000개의 노트를 작성했습니다"
+    _notes40000:
+      title: "노트 공장"
+      description: "40,000개의 노트를 작성했습니다"
+    _notes50000:
+      title: "노트 행성"
+      description: "50,000개의 노트를 작성했습니다"
+    _notes60000:
+      title: "노트 퀘이사"
+      description: "60,000개의 노트를 작성했습니다"
+    _notes70000:
+      title: "노트 블랙홀"
+      description: "70,000개의 노트를 작성했습니다"
+    _notes80000:
+      title: "노트 은하"
+      description: "80,000개의 노트를 작성했습니다"
+    _notes90000:
+      title: "노트 우주"
+      description: "90,000개의 노트를 작성했습니다"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "100,000개의 노트를 작성했습니다"
+      flavor: "이만큼 쓸 일도 없겠지만... 다른 할 일이 있진 않으신가요?"
+    _login3:
+      title: "비기너 I"
+      description: "총 3일간 로그인했습니다"
+      flavor: "오늘부터 여러분도 미스키스트에요!"
+    _login7:
+      title: "비기너 II"
+      description: "총 7일간 로그인했습니다"
+      flavor: "슬슬 익숙해지셨나요?"
+    _login15:
+      title: "비기너 III"
+      description: "총 15일간 로그인했습니다"
+    _login30:
+      title: "미스키스트 I"
+      description: "총 30일간 로그인했습니다"
+    _login60:
+      title: "미스키스트 II"
+      description: "총 60일간 로그인했습니다"
+    _login100:
+      title: "미스키스트 III"
+      description: "총 100일간 로그인했습니다"
+      flavor: "그 유저, 미스키스트이다"
+    _login200:
+      title: "단골 I"
+      description: "총 200일간 로그인했습니다"
+    _login300:
+      title: "단골 II"
+      description: "총 300일간 로그인했습니다"
+    _login400:
+      title: "단골 III"
+      description: "총 400일간 로그인했습니다"
+    _login500:
+      title: "베테랑 I"
+      description: "총 500일간 로그인했습니다"
+      flavor: "제군, 나는 노트가 좋다"
+    _login600:
+      title: "베테랑 II"
+      description: "총 600일간 로그인했습니다"
+    _login700:
+      title: "베테랑 III"
+      description: "총 700일간 로그인했습니다"
+    _login800:
+      title: "노트 마스터 I"
+      description: "총 800일간 로그인했습니다"
+    _login900:
+      title: "노트 마스터 II"
+      description: "총 900일간 로그인했습니다"
+    _login1000:
+      title: "노트 마스터 III"
+      description: "총 1,000일간 로그인했습니다"
+      flavor: "Misskey를 사용해 주셔서 감사합니다!"
+    _noteClipped1:
+      title: "클립할 수밖에 없었어"
+      description: "처음으로 노트를 클립했습니다"
+    _noteFavorited1:
+      title: "별을 바라보는 자"
+      description: "처음으로 노트를 즐겨찾기했습니다"
+    _myNoteFavorited1:
+      title: "별을 원하는 자"
+      description: "다른 사람이 당신의 노트를 즐겨찾기했습니다"
+    _profileFilled:
+      title: "준비 완료"
+      description: "프로필 설정을 완료했습니다"
+    _markedAsCat:
+      title: "나는 고양이다냥!"
+      description: "계정을 고양이로 설정했습니다냥"
+      flavor: "냐냐냐냐냐냐아아아아앙!"
+    _following1:
+      title: "첫 팔로우"
+      description: "사용자를 처음으로 팔로우했습니다"
+    _following10:
+      title: "팔로우, 팔로우"
+      description: "10명의 사용자를 팔로우했습니다"
+    _following50:
+      title: "친구 잔뜩"
+      description: "50명의 사용자를 팔로우했습니다"
+    _following100:
+      title: "주소록 한 권으론 부족해"
+      description: "100명의 사용자를 팔로우했습니다"
+    _following300:
+      title: "친구가 넘쳐나"
+      description: "300명의 사용자를 팔로우했습니다"
+    _followers1:
+      title: "첫 팔로워"
+      description: "사용자가 처음으로 팔로잉했습니다"
+    _followers10:
+      title: "팔로우 미!"
+      description: "10명의 사용자가 팔로우했습니다"
+    _followers50:
+      title: "이곳저곳"
+      description: "50명의 사용자가 팔로우했습니다"
+    _followers100:
+      title: "인기왕"
+      description: "100명의 사용자가 팔로우했습니다"
+    _followers300:
+      title: "줄 좀 서봐요"
+      description: "100명의 사용자가 팔로우했습니다"
+    _followers500:
+      title: "기지국"
+      description: "500명의 사용자가 팔로우했습니다"
+    _followers1000:
+      title: "유명인사"
+      description: "1,000명의 사용자가 팔로우했습니다"
+    _collectAchievements30:
+      title: "도전 과제 콜렉터"
+      description: "30개의 도전과제를 획득했습니다"
+    _viewAchievements3min:
+      title: "저 도전과제 좋아해요"
+      description: "도전 과제 목록을 3분 이상 쳐다봤습니다"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "\"I ❤ #Misskey\"를 포스트했습니다"
+      flavor: "Misskey를 이용해주셔서 감사합니다! - 개발팀 일동"
+    _foundTreasure:
+      title: "보물찾기"
+      description: "숨겨진 보물을 발견했습니다"
+    _client30min:
+      title: "잠깐 쉬어"
+      description: "클라이언트를 시작하고 30분이 경과하였습니다"
+    _noteDeletedWithin1min:
+      title: "있었는데요 없었습니다"
+      description: "노트를 포스트한 후 1분 이내에 삭제했습니다"
+    _postedAtLateNight:
+      title: "올빼미"
+      description: "한밤중에 노트를 포스트했습니다"
+      flavor: "잠 좀 자세요. 걱정돼요."
+    _postedAt0min0sec:
+      title: "정각"
+      description: "0분 0초 정각에 노트를 작성했습니다"
+      flavor: "째깍 째깍 째깍 땡!"
+    _selfQuote:
+      title: "혼잣말"
+      description: "자기 노트를 인용했습니다"
+    _htl20npm:
+      title: "타임라인 폭주 중"
+      description: "1분 사이에 홈 타임라인에 노트가 20개 넘게 생성되었습니다"
+    _viewInstanceChart:
+      title: "애널리스트"
+      description: "인스턴스의 차트를 열었습니다"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "스크래치패드에서 hello world를 출력했습니다"
+    _open3windows:
+      title: "멀티 윈도우"
+      description: "3개 이상의 창을 열었습니다"
+    _driveFolderCircularReference:
+      title: "순환 참조"
+      description: "드라이브 폴더를 자신을 가리키도록 만드려 시도했습니다"
+    _reactWithoutRead:
+      title: "읽고 답하긴 하시는 건가요?"
+      description: "100자가 넘는 노트가 작성되고 3초 안에 반응했습니다"
+    _clickedClickHere:
+      title: "여길 눌러보세요"
+      description: "여길을 눌러봤습니다"
+    _justPlainLucky:
+      title: "그냥 운이 좋았어"
+      description: "매 10초마다 0.01%의 확률로 달성됩니다"
+    _setNameToSyuilo:
+      title: "신 콤플렉스"
+      description: "이름을 syuilo로 설정했습니다"
+    _passedSinceAccountCreated1:
+      title: "1주년"
+      description: "계정을 생성하고 1년이 지났습니다"
+    _passedSinceAccountCreated2:
+      title: "2주년"
+      description: "계정을 생성하고 2년이 지났습니다"
+    _passedSinceAccountCreated3:
+      title: "3주년"
+      description: "계정을 생성하고 3년이 지났습니다"
+    _loggedInOnBirthday:
+      title: "생일 축하합니다!"
+      description: "생일에 로그인했습니다"
+    _loggedInOnNewYearsDay:
+      title: "새해 복 많이 받으세요"
+      description: "새해 첫 날에 로그인했습니다"
+      flavor: "올해에도 저희 인스턴스에 관심을 가져 주셔서 감사합니다"
+    _cookieClicked:
+      title: "쿠키를 클릭하는 게임"
+      description: "쿠키를 클릭했습니다"
+      flavor: "소프트웨어 착각하지 않으셨나요?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Brain Diver로의 링크를 첨부했습니다"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "새 역할 생성"
   edit: "역할 수정"
   name: "역할 이름"
   description: "역할 설명"
-  isPublic: "공개 역할"
+  permission: "역할 권한"
+  descriptionOfPermission: "<b>모더레이터</b>는 기본적인 중재와 관련된 작업을 수행할 수 있습니다.\n<b>관리자</b>는 인스턴스의 모든 설정을 변경할 수 있습니다."
+  assignTarget: "할당 대상"
+  descriptionOfAssignTarget: "<b>수동</b>을 선택하면 누가 이 역할에 포함되는지를 수동으로 관리할 수 있습니다.\n<b>조건부</b>를 선택하면 조건을 설정해 일치하는 사용자를 자동으로 포함되게 할 수 있습니다."
+  manual: "수동"
+  conditional: "조건부"
+  condition: "조건"
+  isConditionalRole: "조건부 역할입니다."
+  isPublic: "역할 공개"
   descriptionOfIsPublic: "역할에 할당된 사용자를 누구나 볼 수 있습니다. 또한 사용자 프로필에 이 역할이 표시됩니다."
   options: "옵션"
+  policies: "정책"
   baseRole: "기본 역할"
   useBaseValue: "기본값 사용"
   chooseRoleToAssign: "할당할 역할 선택"
+  iconUrl: "아이콘 URL"
+  asBadge: "뱃지로 표시"
+  descriptionOfAsBadge: "활성화하면 유저명 옆에 역할의 아이콘이 표시됩니다."
   canEditMembersByModerator: "모더레이터의 역할 수정 허용"
-  descriptionOfCanEditMembersByModerator: "이 옵션을 켜면 모더레이터도 이 역할에 사용자를 추가하거나 삭제할 수 있습니다. 꺼져 있으면 관리자만 가능합니다."
+  descriptionOfCanEditMembersByModerator: "이 옵션을 켜면 모더레이터도 이 역할에 사용자를 할당하거나 삭제할 수 있습니다. 꺼져 있으면 관리자만 할당이 가능합니다."
+  priority: "우선순위"
+  _priority:
+    low: "낮음"
+    middle: "보통"
+    high: "높음"
   _options:
     gtlAvailable: "글로벌 타임라인 보이기"
     ltlAvailable: "로컬 타임라인 보이기"
     canPublicNote: "공개 노트 허용"
+    canInvite: "인스턴스 초대 코드 발행"
+    canManageCustomEmojis: "커스텀 이모지 관리"
     driveCapacity: "드라이브 용량"
+    pinMax: "고정할 수 있는 노트 수"
     antennaMax: "최대 안테나 생성 허용 수"
+    wordMuteMax: "단어 뮤트할 수 있는 문자 수"
+    webhookMax: "생성할 수 있는 웹훅 수"
+    clipMax: "생성할 수 있는 클립 수"
+    noteEachClipsMax: "각 클립에 추가할 수 있는 노트 수"
+    userListMax: "생성할 수 있는 유저 리스트 수"
+    userEachUserListsMax: "유저 리스트당 최대 사용자 수"
+    rateLimitFactor: "요청 빈도 제한"
+    descriptionOfRateLimitFactor: "작을수록 제한이 완화되고, 클수록 제한이 강화됩니다."
+    canHideAds: "광고 숨기기"
+  _condition:
+    isLocal: "로컬 사용자"
+    isRemote: "리모트 사용자"
+    createdLessThan: "가압한 지 다음 일수 이내인 유저"
+    createdMoreThan: "가입한 지 다음 일수 이상인 유저"
+    followersLessThanOrEq: "팔로워 수가 다음 이하인 유저"
+    followersMoreThanOrEq: "팔로워 수가 다음 이상인 유저"
+    followingLessThanOrEq: "팔로잉 수가 다음 이하인 유저"
+    followingMoreThanOrEq: "팔로잉 수가 다음 이상인 유저"
+    and: "다음을 모두 만족"
+    or: "다음을 하나라도 만족"
+    not: "다음을 만족하지 않음"
 _sensitiveMediaDetection:
   description: "기계학습을 통해 자동으로 민감한 미디어를 탐지하여, 모더레이션에 참고할 수 있도록 합니다. 서버의 부하를 약간 증가시킵니다."
   sensitivity: "탐지 민감도"
@@ -981,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "뒤로"
   reduceFrequencyOfThisAd: "이 광고의 표시 빈도 낮추기"
+  hide: "보이지 않음"
 _forgotPassword:
   enterEmail: "여기에 계정에 등록한 메일 주소를 입력해 주세요. 입력한 메일 주소로 비밀번호 재설정 링크를 발송합니다."
   ifNoEmail: "메일 주소를 등록하지 않은 경우, 관리자에 문의해 주십시오."
@@ -1036,72 +1323,6 @@ _nsfw:
   respect: "열람주의로 설정된 미디어 숨기기"
   ignore: "열람 주의 미디어 항상 표시"
   force: "미디어 항상 숨기기"
-_mfm:
-  cheatSheet: "MFM 도움말"
-  intro: "MFM는 Misskey의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다."
-  dummy: "Misskey로 연합우주의 세계가 펼쳐집니다"
-  mention: "멘션"
-  mentionDescription: "골뱅이표(@) 뒤에 사용자명을 넣어 특정 유저를 나타낼 수 있습니다."
-  hashtag: "해시태그"
-  hashtagDescription: "샵 또는 우물정자(#)를 앞에 붙여서 해시태그를 나타낼 수 있습니다."
-  url: "URL"
-  urlDescription: "URL을 나타낼 수 있습니다."
-  link: "링크"
-  linkDescription: "문장의 특정 범위를 URL로 표시합니다."
-  bold: "굵음/볼드체"
-  boldDescription: "문자를 굵게 강조합니다."
-  small: "눈에 띄지 않음"
-  smallDescription: "내용을 작고 연하게 보이게 합니다."
-  center: "가운데 정렬"
-  centerDescription: "내용을 가운데 정렬로 보이게 합니다."
-  inlineCode: "코드(인라인)"
-  inlineCodeDescription: "여러 행의 코드를 문법 강조를 적용하여 인라인으로 표시합니다."
-  blockCode: "코드(블록)"
-  blockCodeDescription: "여러 행의 코드를 문법 강조를 적용하여 블록으로 표시합니다."
-  inlineMath: "수식(인라인)"
-  inlineMathDescription: "수식(KaTeX)를 인라인으로 보이게 합니다."
-  blockMath: "수식(블록)"
-  blockMathDescription: "여러 줄의 수식(KaTeX)를 블록으로 보이게 합니다."
-  quote: "인용"
-  quoteDescription: "내용을 인용문으로 표시합니다."
-  emoji: "커스텀 이모지"
-  emojiDescription: "커스텀 이모지의 이름을 쌍점(:)으로 감싸서 커스텀 이모지를 사용합니다."
-  search: "검색"
-  searchDescription: "주어진 키워드가 입력된 검색창을 보이게 합니다."
-  flip: "플립"
-  flipDescription: "내용을 상하 또는 좌우로 반전시킵니다."
-  jelly: "애니메이션 (젤리)"
-  jellyDescription: "젤리처럼 탱글탱글한 느낌의 효과를 줍니다."
-  tada: "애니메이션 (짠!)"
-  tadaDescription: "짠! 하는 느낌의 효과를 줍니다."
-  jump: "애니메이션(점프)"
-  jumpDescription: "펄쩍 뛸 듯한 느낌의 효과를 줍니다."
-  bounce: "애니메이션 (바운스)"
-  bounceDescription: "통통 튀는 느낌의 효과를 줍니다."
-  shake: "애니메이션 (부들부들)"
-  shakeDescription: "부들부들 떠는 느낌의 효과를 줍니다."
-  twitch: "애니메이션 (경련)"
-  twitchDescription: "격하게 흔들리는 느낌의 효과를 줍니다."
-  spin: "애니메이션 (회전)"
-  spinDescription: "회전 효과를 줍니다."
-  x2: "크게"
-  x2Description: "내용을 크게 표시합니다."
-  x3: "더 크게"
-  x3Description: "내용을 더 크게 표시합니다."
-  x4: "매우 크게"
-  x4Description: "내용을 매우 크게 표시합니다."
-  blur: "흐림"
-  blurDescription: "내용이 흐리게 보입니다. 마우스를 위에 올려두면 내용이 보입니다."
-  font: "폰트"
-  fontDescription: "내용의 글꼴을 지정할 수 있습니다."
-  rainbow: "무지개"
-  rainbowDescription: "내용을 무지개로 표시합니다."
-  sparkle: "반짝반짝"
-  sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
-  rotate: "회전"
-  rotateDescription: "지정한 각도로 회전시킵니다."
-  plain: "평문"
-  plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
   none: "보이지 않음"
   remote: "리모트 유저에게만 보이기"
@@ -1264,14 +1485,14 @@ _tutorial:
   step8_3: "알림 설정은 나중에도 변경할 수 있습니다."
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
-  registerDevice: "디바이스 등록"
-  registerKey: "키를 등록"
   step1: "먼저, {a}나 {b}등의 인증 앱을 사용 중인 디바이스에 설치합니다."
   step2: "그 후, 표시되어 있는 QR코드를 앱으로 스캔합니다."
   step2Url: "데스크톱 앱에서는 다음 URL을 입력하세요:"
   step3: "앱에 표시된 토큰을 입력하시면 완료됩니다."
   step4: "다음 로그인부터는 토큰을 입력해야 합니다."
   securityKeyInfo: "FIDO2를 지원하는 하드웨어 보안 키 혹은 디바이스의 지문인식이나 화면잠금 PIN을 이용해서 로그인하도록 설정할 수 있습니다."
+  removeKeyConfirm: "{name} 을(를) 삭제하시겠습니까?"
+  renewTOTPCancel: "나중에"
 _permissions:
   "read:account": "계정의 정보를 봅니다"
   "write:account": "계정의 정보를 변경합니다"
@@ -1306,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "갤러리의 좋아요를 확인합니다"
   "write:gallery-likes": "갤러리에 좋아요를 추가하거나 취소합니다"
 _auth:
+  shareAccessTitle: "어플리케이션의 접근 허가"
   shareAccess: "\"{name}\" 이 계정에 접근하는 것을 허용하시겠습니까?"
   shareAccessAsk: "이 애플리케이션이 계정에 접근하는 것을 허용하시겠습니까?"
+  permission: "{name}에서 다음 권한을 요청하였습니다"
   permissionAsk: "이 앱은 다음의 권한을 요청합니다"
   pleaseGoBack: "앱으로 돌아가서 시도해 주세요"
   callback: "앱으로 돌아갑니다"
   denied: "접근이 거부되었습니다"
+  pleaseLogin: "어플리케이션의 접근을 허가하려면 로그인하십시오."
 _antennaSources:
   all: "모든 노트"
   homeTimeline: "팔로우중인 유저의 노트"
   users: "지정한 한 명 혹은 여러 명의 유저의 노트"
   userList: "지정한 리스트에 속한 유저의 노트"
-  userGroup: "지정한 그룹에 속한 유저의 노트"
 _weekday:
   sunday: "일요일"
   monday: "월요일"
@@ -1352,7 +1575,7 @@ _widgets:
   aiscript: "AiScript 콘솔"
   aiscriptApp: "AiScript 앱"
   aichan: "아이"
-  userList: "사용자 목록"
+  userList: "유저 리스트"
   _userList:
     chooseList: "리스트 선택"
   clicker: "클리커"
@@ -1392,8 +1615,6 @@ _visibility:
   followersDescription: "팔로워에게만 공개"
   specified: "다이렉트"
   specifiedDescription: "지정한 유저에게만 공개"
-  localOnly: "로컬에만"
-  localOnlyDescription: "리모트 유저에게 보이지 않기"
 _postForm:
   replyPlaceholder: "이 노트에 답글..."
   quotePlaceholder: "이 노트를 인용..."
@@ -1531,15 +1752,13 @@ _notification:
   youGotReply: "{name}님이 답글함"
   youGotQuote: "{name}님이 인용함"
   youRenoted: "{name}님이 Renote"
-  youGotMessagingMessageFromUser: "{name} 님이 보낸 채팅이 있어요"
-  youGotMessagingMessageFromGroup: "{name}에서 보낸 채팅이 있어요"
   youWereFollowed: "새로운 팔로워가 있습니다"
   youReceivedFollowRequest: "새로운 팔로우 요청이 있습니다"
   yourFollowRequestAccepted: "팔로우 요청이 수락되었습니다"
-  youWereInvitedToGroup: "그룹에 초대되었습니다"
   pollEnded: "투표 결과가 발표되었습니다"
   unreadAntennaNote: "안테나 {name}"
   emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
+  achievementEarned: "도전 과제를 달성했습니다"
   _types:
     all: "전부"
     follow: "팔로잉"
@@ -1551,7 +1770,6 @@ _notification:
     pollEnded: "투표가 종료됨"
     receiveFollowRequest: "팔로우 요청을 받았을 때"
     followRequestAccepted: "팔로우 요청이 승인되었을 때"
-    groupInvited: "그룹에 초대되었을 때"
     app: "연동된 앱을 통한 알림"
   _actions:
     followBack: "팔로우"
@@ -1581,5 +1799,6 @@ _deck:
     tl: "타임라인"
     antenna: "안테나"
     list: "리스트"
+    channel: "채널"
     mentions: "받은 멘션"
     direct: "다이렉트"

locales/lo-LA.yml

@@ -0,0 +1,267 @@
+---
+_lang_: "ພາສາລາວ"
+headlineMisskey: "ເຊື່ອມຕໍ່ເຄືອຂ່າຍໂດຍຫມາຍເຫດ"
+introMisskey: "ຍິນດີຕ້ອນຮັບ! Misskey ເປັນແຫຼ່ງເປີດ, ການບໍລິການ microblogging ກະຈາຍ\nສ້າງ \"ບັນທຶກ\" ເພື່ອແບ່ງປັນຄວາມຄິດຂອງທ່ານກັບທຸກໆຄົນທີ່ຢູ່ອ້ອມຮອບທ່ານ 📡\nດ້ວຍ \"ປະຕິກິລິຍາ\", ທ່ານຍັງສາມາດສະແດງຄວາມຮູ້ສຶກຂອງທ່ານຢ່າງໄວວາກ່ຽວກັບບັນທຶກຂອງທຸກໆຄົນ 👍\nມາສຳຫຼວດໂລກໃໝ່! 🚀"
+poweredByMisskeyDescription: "{name} ແມ່ນສ່ວນໜຶ່ງຂອງການບໍລິການທີ່ຂັບເຄື່ອນໂດຍແພລດຟອມ open source. <b>Misskey</b> (ເອີ້ນວ່າ \"Misskey instance\")"
+monthAndDay: "{ເດືອນ}/{ມື້}"
+search: "ຄົ້ນຫາ"
+notifications: "ການແຈ້ງເຕືອນ"
+username: "ຊື່ຜູ້ໃຊ້"
+password: "ລະຫັດຜ່ານ"
+forgotPassword: "ລືມລະຫັດຜ່ານ"
+fetchingAsApObject: "ກຳລັງດຶງຂໍ້ມູນຈາກ fediverse..."
+ok: "ຕົກ​ລົງ"
+gotIt: "ເຂົ້າໃຈແລ້ວ!"
+cancel: "ຍົກເລີກ"
+noThankYou: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້"
+enterUsername: "ປ້ອນຊື່ຜູ້ໃຊ້"
+renotedBy: "Renoted ໂດຍ {ຜູ້ໃຊ້}"
+noNotes: "ບໍ່ມີຫມາຍເຫດ"
+noNotifications: "ບໍ່ມີການແຈ້ງເຕືອນ"
+instance: "ອີນສະແຕນ"
+settings: "ກຳນົດຄ່າ"
+basicSettings: "ການຕັ້ງຄ່າພື້ນຖານ"
+otherSettings: "ການຕັ້ງຄ່າອື່ນໆ"
+openInWindow: "ເປີດຢູ່ໃນປ່ອງຢ້ຽມ"
+profile: "ໂພຼຟາຍ"
+timeline: "​ເສັ້ນກຳ​ນົດ​ເວ​ລາ​"
+noAccountDescription: "ຜູ້ໃຊ້ນີ້ຍັງບໍ່ໄດ້ຂຽນໃນຊີວະປະຫວັດຂອງເຂົາເຈົ້າເທື່ອ"
+login: "ເຂົ້າ​ສູ່​ລະ​ບົບ"
+loggingIn: "ກຳລັງເຂົ້າສູ່ລະບົບ..."
+logout: "ອອກ​ຈາກ​ລະ​ບົບ"
+signup: "ລົງ​ທະ​ບຽນ"
+uploading: "ການອັບໂຫຼດ..."
+save: "ບັນທຶກ"
+users: "ຜູ້ໃຊ້ຕ່າງໆ"
+addUser: "ເພີ່ມຜູ້ໃຊ້"
+favorite: "ເພີ່ມໃສ່ລາຍການທີ່ມັກ"
+favorites: "ລາຍການທີ່ມັກ"
+unfavorite: "ລຶບອອກຈາກລາຍການທີ່ມັກ"
+favorited: "ເພີ່ມໃສ່ລາຍການທີ່ມັກແລ້ວ"
+alreadyFavorited: "ເພີ່ມເຂົ້າໃນລາຍການທີ່ມັກແລ້ວ."
+cantFavorite: "ບໍ່ສາມາດເພີ່ມໃສ່ລາຍການທີ່ມັກໄດ້."
+pin: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
+unpin: "ຖອດປັກໝຸດອອກຈາກໂປຣໄຟລ໌"
+copyContent: "ຄັດລອກເນື້ອຫາ"
+copyLink: "ສຳເນົາລິ້ງ"
+delete: "ລຶບ"
+deleteAndEdit: "ລົບ​ແລະ​ແກ້​ໄຂ​"
+deleteAndEditConfirm: "ເຈົ້າ​ແນ່​ໃຈ​ບໍ່? ທີ່ທ່ານຕ້ອງການທີ່ຈະລຶບບັນທຶກນີ້ແລະແກ້ໄຂມັນ ທ່ານອາດຈະສູນເສຍການໂຕ້ຕອບ, ບັນທຶກ, ແລະການຕອບກັບທັງໝົດ"
+addToList: "ເພີ່ມໃສ່ລາຍຊື່"
+sendMessage: "ສົ່ງຂໍ້ຄວາມ"
+copyRSS: "ສຳເນົາ RSS"
+copyUsername: "ສຳເນົາຊື່ຜູ້ໃຊ້"
+searchUser: "ຄົ້ນຫາຜູ້ໃຊ້"
+reply: "ຕອບ​ໄປ​ທີ"
+loadMore: "ໂຫຼດເພີ່ມເຕີມ"
+showMore: "ໂຫຼດເພີ່ມເຕີມ"
+showLess: "ປິດ"
+youGotNewFollower: "ໄດ້ຕິດຕາມທ່ານ"
+receiveFollowRequest: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ໄດ້ຮັບ"
+followRequestAccepted: "ຜູ້ຕິດຕາມໄດ້ຍອມຮັບຄໍາຮ້ອງຂໍຂອງທ່ານ"
+mention: "ໄດ້ກ່າວມາ"
+mentions: "ກ່າວເຖິງ"
+directNotes: "ໂດຍກົງຫມາຍເຫດ"
+importAndExport: "ນໍາເຂົ້າ / ສົ່ງອອກ"
+import: "ນຳເຂົ້າ"
+export: "ນຳອອກ"
+files: "ໄຟລ໌"
+download: "ດາວໂຫລດ"
+driveFileDeleteConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບໄຟລ໌ \"{name}\"? ບັນທຶກທີ່ມີໄຟລ໌ແນບນີ້ຈະຖືກລຶບຖິ້ມ"
+unfollowConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການເຊົາຕິດຕາມ {name}?"
+exportRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການສົ່ງອອກ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ ແລະມັນຈະຖືກເພີ່ມໃສ່ drive ຂອງທ່ານເມື່ອມັນສຳເລັດແລ້ວ"
+importRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການນໍາເຂົ້າ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ"
+lists: "ລາຍການ"
+noLists: "ທ່ານ​ບໍ່​ມີ​ລາຍ​ການ​ໃດໆ​"
+note: "ບັນທຶກ"
+notes: "ບັນທຶກ"
+following: "ກຳລັງຕິດຕາມ"
+followers: "ຜູ້ຕິດຕາມ"
+followsYou: "ຕິດ​ຕາມ​ເຈົ້າ"
+createList: "ສ້າງລາຍຊື່"
+manageLists: "ການບໍລິຫານບັນຊີລາຍການ"
+error: "ຂໍ້ຜິດພາດ"
+somethingHappened: "​ອຸຍ, ມີ​ບາງ​ຢ່າງ​ຜິ​ດ​ພາດ"
+retry: "ລອງໃຫມ່"
+pageLoadError: "ເກີດຄວາມຜິດພາດໃນການໂຫລດໜ້ານີ້"
+pageLoadErrorDescription: "ປົກກະຕິແລ້ວມັນເກີດຈາກຄວາມຜິດພາດເຄືອຂ່າຍ ຫຼື cache ຂອງຕົວທ່ອງເວັບ ລອງລຶບລ້າງແຄດແລ້ວລອງໃໝ່ພາຍຫຼັງສອງສາມນາທີ"
+serverIsDead: "ເຊີບເວີນີ້ບໍ່ຕອບສະໜອງ ກະລຸນາລໍຖ້າຈັກໜ່ອຍແລ້ວລອງໃໝ່ອີກຄັ້ງ"
+youShouldUpgradeClient: "ເພື່ອເບິ່ງໜ້ານີ້, ກະລຸນາໂຫຼດຂໍ້ມູນຄືນໃໝ່ເພື່ອອັບເດດລູກຄ້າຂອງທ່ານ"
+enterListName: "ໃສ່ຊື່ສຳລັບລາຍຊື່"
+privacy: "ຄວາມເປັນສ່ວນຕົວ"
+makeFollowManuallyApprove: "ປະຕິບັດຕາມການຮ້ອງຂໍຮຽກຮ້ອງໃຫ້ມີການອະນຸມັດ"
+defaultNoteVisibility: "ເປັນຄ່າເລີ່ມຕົ້ນ"
+follow: "ກຳລັງຕິດຕາມ"
+followRequest: "ສົ່ງ​ການ​ຮ້ອງ​ຂໍ​ປະ​ຕິ​ບ​ຕາມ​"
+followRequests: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍ"
+unfollow: "ເຊົາຕິດຕາມ"
+followRequestPending: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ລໍຖ້າຢູ່"
+enterEmoji: "ປ້ອນອີໂມຈິ"
+renote: "Renote"
+unrenote: "ເລີກ Renote"
+renoted: "ເກັບບັນທຶກໄວ້"
+quote: "ລວມຂໍ້ຄວາມອ້າງອີງ"
+pinnedNote: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
+pinned: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
+you: "ເຈົ້າ"
+clickToShow: "ກົດເພື່ອສະແດງໃຫ້ເຫັນ"
+sensitive: "NSFW"
+add: "ເພີ່ມ"
+reaction: "ປະຕິກິລິຍາ"
+reactions: "ປະຕິກິລິຍາ"
+mute: "ປີດສຽງ"
+unmute: "ເປີດສຽງ"
+block: "ບ໋ອກ"
+unblock: "ຍົກເລີກກາຮົບລັອກ"
+suspend: "ລະງັບ"
+unsuspend: "ເຊົາ​ລະ​ງັບ"
+selectList: "ເລືອກບັນຊີລາຍການ"
+selectWidget: "ເລືອກວິກເຈັດ"
+editWidgets: "ແກ້ໄຂ Widget"
+editWidgetsExit: "ສຳເລັດແລ້ວ"
+customEmojis: "ອີໂມຈິແບບກຳນົດເອງ"
+emoji: "ອີໂມຈິ"
+emojis: "ອີໂມຈິ"
+emojiName: "ຊື່ Emoji"
+emojiUrl: "URL ອີໂມຈິ"
+addEmoji: "ຕື່ມອີໂມຈິ"
+flagAsBot: "ໝາຍບັນຊີນີ້ເປັນບັອດ"
+flagAsCat: "ໝາຍບັນຊີນີ້ເປັນແມວ"
+flagAsCatDescription: "ເປີດໃຊ້ຕົວເລືອກນີ້ເພື່ອໝາຍບັນຊີນີ້ເປັນແມວ"
+flagShowTimelineReplies: "ສະແດງການຕອບກັບໃນທາມລາຍ"
+flagShowTimelineRepliesDescription: "ສະແດງການຕອບກັບຂອງຜູ້ໃຊ້ຕໍ່ກັບບັນທຶກຂອງຜູ້ໃຊ້ອື່ນໃນທາມລາຍຖ້າເປີດໃຊ້ງານ"
+autoAcceptFollowed: "ອະນຸມັດອັດຕະໂນມັດຕາມຄຳຮ້ອງຂໍຈາກຜູ້ໃຊ້ທີ່ທ່ານກຳລັງຕິດຕາມຢູ່"
+addAccount: "ເພີ່ມບັນຊີ"
+loginFailed: "ການເຂົ້າສູ່ລະບົບບໍ່ສຳເລັດ"
+general: "ທົ່ວໄປ"
+wallpaper: "ພາບພື້ນຫລັງ"
+setWallpaper: "ຕັ້ງເປັນພາບພື້ນຫຼັງ"
+searchWith: "ຊອກຫາ: {q}"
+proxyAccount: "ບັນຊີພຣັອກຊີ"
+host: "ໂຮດສ"
+selectUser: "ເລືອກຜູ້ໃຊ້"
+recipient: "ເຖິງ"
+annotation: "ຄຳເຫັນ"
+federation: "ສະຫະພັນ"
+instances: "ອີນສະແຕນ"
+registeredAt: "ລົງທະບຽນຢູ່"
+storageUsage: "ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນທີ່ໃຊ້"
+charts: "ອັນດັບເພງ"
+perHour: "ຕໍ່ຊົ່ວໂມງ"
+perDay: "ຕໍ່​ມື້"
+stopActivityDelivery: "ຢຸດເຊົາການສົ່ງກິດຈະກໍາ"
+blockThisInstance: "ຂັດຂວາງຕົວຢ່າງນີ້"
+operations: "ການດຳເນີນງານ"
+software: "ຊອບແວ"
+version: "ສະບັບ"
+metadata: "Metadata"
+monitor: "ຈໍພາບ"
+cpuAndMemory: "CPU ແລະ ຫນ່ວຍຄວາມຈໍາ"
+network: "ເຄືອຂ່າຍ"
+disk: "ດິສກ໌"
+instanceInfo: "ອີນສະແຕນ"
+statistics: "ສະຖິຕິ"
+clearQueue: "ລ້າງຄິວ"
+clearCachedFiles: "ລຶບລ້າງແຄສ"
+editProfile: "ແກ້ໄຂໂປຣໄຟລ໌"
+done: "ສຳເລັດ"
+processing: "ກຳລັງປະມວນຜົນ"
+preview: "ສະແດງເປັນຕົວຢ່າງ"
+default: "ຄ່າເລີ່ມຕົ້ນ"
+blocked: "ບລັອກແລ້ວ "
+all: "ທັງໝົດ"
+subscribing: "ສະໝັກສະມາຊິກແລັວ"
+publishing: "ການ​ພິມ​ເຜີຍ​ແຜ່"
+notResponding: "ບໍ່ຕອບສະໜອງ"
+instanceFollowing: "ກຳລັງຕິດຕາມສຸດຕົວຢ່າງ"
+instanceFollowers: "ຜູ້ຕິດຕາມຕົວຢ່າງ"
+instanceUsers: "ຜູ້​ຊົມ​ໃຊ້​ຂອງ​ຕົວ​ຢ່າງ​ນີ້​"
+changePassword: "ປ່ຽນ​ລະ​ຫັດ​ຜ່ານ"
+featured: "ໄຮໄລທ໌"
+announcements: "ປະກາດ"
+remove: "ລຶບ"
+messaging: "ແຊ໋ດ"
+tos: "ເງື່ອນໄຂການໃຫ້ບໍລິການ"
+start: "ເລີ່ມຕົ້ນນຳໃຊ້ເລີຍ"
+home: "ໜ້າຫຼັກ"
+images: "ຮູບພາບ"
+birthday: "ວັນເກີດ"
+registeredDate: "ວັນທີ່ເປັນສະມາຊິກ"
+location: "ທີ່ຕັ້ງ"
+theme: "ແທ໋ມ"
+light: "ສະຫວ່າງ"
+dark: "ມືດ"
+lightThemes: "ຊຸດຮູບແບບສະຫວ່າງ"
+darkThemes: "ຮູບແບບສີສັນມືດ"
+fileName: "ຊື່ໄຟລ໌"
+selectFile: "ເລືອກໄຟລ໌"
+selectFiles: "ເລືອກໄຟລ໌"
+nsfw: "NSFW"
+accept: "ອະນຸຍາດ"
+pinnedNotes: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
+userList: "ລາຍການ"
+smtpHost: "ໂຮດສ"
+smtpUser: "ຊື່ຜູ້ໃຊ້"
+smtpPass: "ລະຫັດຜ່ານ"
+clearCache: "ລຶບລ້າງແຄສ"
+user: "ຜູ້ໃຊ້ຕ່າງໆ"
+searchByGoogle: "ຄົ້ນຫາ"
+file: "ໄຟລ໌"
+_email:
+  _follow:
+    title: "ໄດ້ຕິດຕາມທ່ານ"
+_theme:
+  keys:
+    mention: "ໄດ້ກ່າວມາ"
+    renote: "Renote"
+_sfx:
+  note: "ບັນທຶກ"
+  notification: "ການແຈ້ງເຕືອນ"
+  chat: "ແຊ໋ດ"
+_2fa:
+  renewTOTPCancel: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້"
+_widgets:
+  profile: "ໂພຼຟາຍ"
+  instanceInfo: "ອີນສະແຕນ"
+  notifications: "ການແຈ້ງເຕືອນ"
+  timeline: "​ເສັ້ນກຳ​ນົດ​ເວ​ລາ​"
+  federation: "ສະຫະພັນ"
+  _userList:
+    chooseList: "ເລືອກບັນຊີລາຍການ"
+_cw:
+  show: "ໂຫຼດເພີ່ມເຕີມ"
+_visibility:
+  home: "ໜ້າຫຼັກ"
+  followers: "ຜູ້ຕິດຕາມ"
+_profile:
+  username: "ຊື່ຜູ້ໃຊ້"
+_exportOrImport:
+  followingList: "ກຳລັງຕິດຕາມ"
+  muteList: "ປີດສຽງ"
+  blockingList: "ບ໋ອກ"
+  userLists: "ລາຍການ"
+_charts:
+  federation: "ສະຫະພັນ"
+_timelines:
+  home: "ໜ້າຫຼັກ"
+_pages:
+  blocks:
+    image: "ຮູບພາບ"
+_notification:
+  youWereFollowed: "ໄດ້ຕິດຕາມທ່ານ"
+  _types:
+    follow: "ກຳລັງຕິດຕາມ"
+    mention: "ໄດ້ກ່າວມາ"
+    renote: "Renote"
+    quote: "ລວມຂໍ້ຄວາມອ້າງອີງ"
+    reaction: "ປະຕິກິລິຍາ"
+  _actions:
+    reply: "ຕອບ​ໄປ​ທີ"
+    renote: "Renote"
+_deck:
+  _columns:
+    notifications: "ການແຈ້ງເຕືອນ"
+    tl: "​ເສັ້ນກຳ​ນົດ​ເວ​ລາ​"
+    list: "ລາຍການ"
+    channel: "ຊ່ອງ"
+    mentions: "ກ່າວເຖິງ"

locales/nl-NL.yml

@@ -109,6 +109,7 @@ clickToShow: "Klik om te bekijken"
 sensitive: "NSFW"
 add: "Toevoegen"
 reaction: "Reacties"
+reactions: "Reacties"
 reactionSetting: "Reacties die in de reactie-selector worden getoond"
 reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
 rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
@@ -375,13 +376,10 @@ about: "Over"
 aboutMisskey: "Over Misskey"
 administrator: "Beheerder"
 token: "Token"
-twoStepAuthentication: "Tweestapsverificatie"
 moderator: "Moderator"
 moderation: "Moderatie"
 nUsersMentioned: "Vermeld door {n} gebruikers"
 securityKey: "Beveiligingssleutel"
-securityKeyName: "Sleutelnaam"
-registerSecurityKey: "Zekerheids-Sleutel registreren"
 lastUsed: "Laatst gebruikt"
 unregister: "Uitschrijven"
 passwordLessLogin: "Inloggen zonder wachtwoord"
@@ -398,8 +396,6 @@ markAsReadAllTalkMessages: "Markeer alle berichten als gelezen"
 help: "Help"
 inputMessageHere: "Voer hier je bericht in"
 close: "Sluiten"
-group: "Groep"
-groups: "Groepen"
 invites: "Uitnodigen"
 invitations: "Uitnodigen"
 sound: "Geluid"
@@ -426,11 +422,6 @@ loggedInAsBot: "Momenteel als bot ingelogd"
 _email:
   _follow:
     title: "volgde jou"
-_mfm:
-  mention: "Vermelding"
-  quote: "Quote"
-  emoji: "Maatwerk emoji"
-  search: "Zoeken"
 _theme:
   keys:
     mention: "Vermelding"
@@ -439,6 +430,8 @@ _sfx:
   note: "Notities"
   notification: "Meldingen"
   chat: "Chat"
+_2fa:
+  renewTOTPCancel: "Nee, bedankt"
 _widgets:
   profile: "Profiel"
   instanceInfo: "Serverinformatie"

locales/pl-PL.yml

@@ -110,6 +110,7 @@ clickToShow: "Kliknij, aby wyświetlić"
 sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
+reactions: "Reakcja"
 reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
 reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
@@ -384,13 +385,10 @@ about: "Informacje"
 aboutMisskey: "O Misskey"
 administrator: "Admin"
 token: "Token"
-twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe"
 moderator: "Moderator"
 moderation: "Moderacja"
 nUsersMentioned: "{n} wspomnianych użytkowników"
 securityKey: "Klucz bezpieczeństwa"
-securityKeyName: "Nazwa klucza"
-registerSecurityKey: "Zarejestruj klucz bezpieczeństwa"
 lastUsed: "Ostatnio używane"
 unregister: "Cofnij rejestrację"
 passwordLessLogin: "Skonfiguruj logowanie bez użycia hasła"
@@ -408,24 +406,15 @@ markAsReadAllTalkMessages: "Oznacz wszystkie wiadomości jako przeczytane"
 help: "Pomoc"
 inputMessageHere: "Wprowadź wiadomość tutaj"
 close: "Zamknij"
-group: "Grupy"
-groups: "Grupy"
-createGroup: "Utwórz grupę"
-ownedGroups: "Posiadane grupy"
-joinedGroups: "Członkostwa w grupach"
 invites: "Zaproś"
-groupName: "Nazwa grupy"
 members: "Członkowie"
 transfer: "Transfer"
-messagingWithUser: "Rozmowy z innym użytkownikiem"
-messagingWithGroup: "Rozmowy wewnątrz grupy"
 title: "Tytuł"
 text: "Tekst"
 enable: "Włącz"
 next: "Dalej"
 retype: "Wprowadź ponownie"
 noteOf: "Wpisy {user}"
-inviteToGroup: "Zaproś do grupy"
 quoteAttached: "Zacytowano"
 quoteQuestion: "Czy na pewno chcesz umieścić cytat?"
 noMessagesYet: "Nie napisano jeszcze wiadomości"
@@ -447,20 +436,15 @@ passwordMatched: "Pasuje"
 passwordNotMatched: "Hasła nie pasują do siebie"
 signinWith: "Zaloguj się z {x}"
 signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są nieprawidłowe."
-tapSecurityKey: "Wybierz swój klucz bezpieczeństwa"
 or: "Lub"
 language: "Język"
 uiLanguage: "Język wyświetlania UI"
-groupInvited: "Zaproszony(-a) do grupy"
 aboutX: "O {x}"
 emojiStyle: "Styl emoji"
 native: "Natywny"
 disableDrawer: "Nie używaj menu w stylu szuflady"
-youHaveNoGroups: "Nie masz żadnych grup"
-joinOrCreateGroup: "Uzyskaj zaproszenie do dołączenia do grupy lub utwórz własną grupę."
 noHistory: "Brak historii"
 signinHistory: "Historia logowania"
-disableAnimatedMfm: "Wyłącz MFM z animacją"
 doing: "Przetwarzanie..."
 category: "Kategoria"
 tags: "Tagi"
@@ -816,8 +800,6 @@ deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kont
 incorrectPassword: "Nieprawidłowe hasło."
 voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
-leaveGroup: "Opuść grupę"
-leaveGroupConfirm: "Czy na pewno chcesz opuścić \"{name}\"?"
 useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
 welcomeBackWithName: "Witaj z powrotem, {name}"
 clickToFinishEmailVerification: "Kliknij [{ok}], aby zakończyć weryfikację e-mail."
@@ -869,6 +851,12 @@ loggedInAsBot: "Jesteś obecnie zalogowany/a jako bot"
 like: "Polub"
 show: "Wyświetlanie"
 color: "Kolor"
+_role:
+  priority: "Priorytet"
+  _priority:
+    low: "Niski"
+    middle: "Średnie"
+    high: "Wysoki"
 _sensitiveMediaDetection:
   description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera."
   setSensitiveFlagAutomatically: "Oznacz jako NSFW"
@@ -896,6 +884,7 @@ _accountDelete:
 _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
+  hide: "Nigdy nie pokazuj"
 _forgotPassword:
   enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany link, za pomocą którego możesz zresetować hasło."
   ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się z administratorem zamiast tego."
@@ -950,68 +939,6 @@ _nsfw:
   respect: "Ukrywaj media NSFW"
   ignore: "Nie ukrywaj mediów NSFW"
   force: "Ukrywaj wszystkie media"
-_mfm:
-  cheatSheet: "Ściąga MFM"
-  intro: "MFM to język składniowy wyjątkowy dla Misskey, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
-  dummy: "Misskey rozszerza świat Fediwersum"
-  mention: "Wspomnij"
-  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego użytkownika."
-  hashtag: "Hashtag"
-  hashtagDescription: "Używając kratki i tekstu, możesz określić hashtag."
-  url: "Adres URL"
-  urlDescription: "Adresy URL mogą być wyświetlane"
-  link: "Odnośnik"
-  linkDescription: "Określone części tekstu mogą być wyświetlane jako adres URL."
-  bold: "Pogrubienie"
-  boldDescription: "Wyróżnia litery pogrubiając je."
-  small: "Małe"
-  smallDescription: "Wyświetla treść jako małą i cienką."
-  center: "Wyśrodkowanie"
-  centerDescription: "Wyśrodkowuje zawartość."
-  inlineCode: "Kod (w wierszu)"
-  blockCode: "Kod (blok)"
-  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu linii."
-  blockMath: "Matematyka (Blok)"
-  quote: "Cytuj"
-  quoteDescription: "Wyświetla treść jako cytat."
-  emoji: "Niestandardowe emoji"
-  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć niestandardowego emoji."
-  search: "Szukaj"
-  searchDescription: "Wyświetla pole wyszukiwania z wcześniej wpisanym tekstem."
-  flip: "Odwróć"
-  flipDescription: "Przerzuca treść poziomo lub pionowo."
-  jelly: "Animacja (Galaretka)"
-  jellyDescription: "Nadaje treści galaretowatą animację."
-  tada: "Animation (Tada)"
-  tadaDescription: "Nadaje treści animację podobną do \"Tada!\"."
-  jump: "Animacja (Skok)"
-  jumpDescription: "Nadaje treści animację skakania."
-  bounce: "Animacja (Odbijanie)"
-  bounceDescription: "Nadaje treści animację odbijania się."
-  shake: "Animacja (Wstrząsanie)"
-  shakeDescription: "Nadaje treści animację wstrząsania."
-  twitch: "Animacja (Drganie)"
-  twitchDescription: "Nadaje treści mocno drgającą animację."
-  spin: "Animacja (Obrót)"
-  spinDescription: "Nadaje treści animację obracania."
-  x2: "Duże"
-  x2Description: "Czyni treść większą."
-  x3: "Bardzo duże"
-  x3Description: "Czyni treść jeszcze większą."
-  x4: "Ogromne"
-  x4Description: "Czyni treść jeszcze większą niż jeszcze większa."
-  blur: "Rozmycie"
-  blurDescription: "Rozmywa treść. Zostanie wyraźnie wyświetlona po najechaniu."
-  font: "Czcionka"
-  fontDescription: "Wybiera czcionkę do wyświetlania treści."
-  rainbow: "Tęcza"
-  rainbowDescription: "Sprawia, że zawartość pojawia się w kolorach tęczy."
-  sparkle: "Blask"
-  sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
-  rotate: "Obróć"
-  rotateDescription: "Obraca zawartość o określony kąt."
-  plain: "Zwyczajny"
-  plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
@@ -1167,12 +1094,12 @@ _tutorial:
   step8_3: "Ustawienia powiadomień można zmienić później."
 _2fa:
   alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
-  registerDevice: "Zarejestruj nowe urządzenie"
-  registerKey: "Zarejestruj klucz bezpieczeństwa"
   step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
   step2: "Następnie, zeskanuje kod QR z ekranu."
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
   step4: "Od teraz, przy każdej próbie logowania otrzymasz prośbę o token logowania."
+  removeKeyConfirm: "Usunąć kopię zapasową {name}?"
+  renewTOTPCancel: "Nie teraz"
 _permissions:
   "read:account": "Wyświetl informacje o swoim koncie"
   "write:account": "Edytuj swoje informacje o koncie"
@@ -1383,12 +1310,9 @@ _notification:
   youGotReply: "{name} odpowiedział(a) Tobie"
   youGotQuote: "{name} zacytował(a) Ciebie"
   youRenoted: "{name} udostępnił(a) Twój wpis"
-  youGotMessagingMessageFromUser: "{name} wysłał(a) Ci wiadomość"
-  youGotMessagingMessageFromGroup: "Została wysłana wiadomość do grupy {name}"
   youWereFollowed: "Zaobserwował(a) Cię"
   youReceivedFollowRequest: "Otrzymałeś(-aś) prośbę o możliwość obserwacji"
   yourFollowRequestAccepted: "Twoja prośba o możliwość obserwacji została przyjęta"
-  youWereInvitedToGroup: "Zaproszony(-a) do grupy"
   pollEnded: "Wyniki ankiety stały się dostępne"
   unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Powiadomienia push zostały zaktualizowane"
@@ -1402,7 +1326,6 @@ _notification:
     reaction: "Reakcja"
     receiveFollowRequest: "Otrzymano prośbę o możliwość obserwacji"
     followRequestAccepted: "Przyjęto prośbę o możliwość obserwacji"
-    groupInvited: "Zaproszono do grup"
     app: "Powiadomienia z aplikacji"
   _actions:
     followBack: "zaobserwował cię z powrotem"
@@ -1430,5 +1353,6 @@ _deck:
     tl: "Oś czasu"
     antenna: "Anteny"
     list: "Listy"
+    channel: "Kanały"
     mentions: "Wspomnienia"
     direct: "Bezpośredni"

locales/pt-PT.yml

@@ -107,6 +107,7 @@ clickToShow: "Clique para ver"
 sensitive: "Conteúdo sensível"
 add: "Adicionar"
 reaction: "Reações"
+reactions: "Reações"
 reactionSetting: "Quais reações a mostrar no selecionador de reações"
 reactionSettingDescription2: "Arraste para reordenar, clique para excluir, pressione + para adicionar."
 rememberNoteVisibility: "Lembrar das configurações de visibilidade de notas"
@@ -381,12 +382,9 @@ about: "Informações"
 aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Símbolo"
-twoStepAuthentication: "Verificação em duas etapas"
 moderator: "Moderador"
 nUsersMentioned: "Postado por {n} pessoas"
 securityKey: "Chave de segurança"
-securityKeyName: "Nome chave"
-registerSecurityKey: "Registre a chave de segurança"
 lastUsed: "Último uso"
 unregister: "Cancelar registro"
 passwordLessLogin: "Entrar sem senha"
@@ -404,10 +402,6 @@ markAsReadAllTalkMessages: "Marcar todas as conversas como lidas"
 help: "Ajuda"
 inputMessageHere: "Escrever mensagem aqui"
 close: "Fechar"
-group: "Grupos"
-groups: "Grupos"
-createGroup: "Criar grupo"
-ownedGroups: "Grupo próprio"
 invites: "Convidar"
 invitations: "Convidar"
 tags: "Etiquetas"
@@ -474,11 +468,6 @@ file: "Ficheiros"
 _email:
   _follow:
     title: "Você tem um novo seguidor"
-_mfm:
-  mention: "Menção"
-  quote: "Citar"
-  emoji: "Emoji personalizado"
-  search: "Buscar"
 _theme:
   keys:
     mention: "Menção"
@@ -526,12 +515,9 @@ _notification:
   youGotMention: "{name} te mencionou"
   youGotReply: "{name} te respondeu"
   youGotQuote: "{name} te citou"
-  youGotMessagingMessageFromUser: "{name} te mandou uma mensagem de bate-papo"
-  youGotMessagingMessageFromGroup: "Uma mensagem foi mandada para o grupo {name}"
   youWereFollowed: "Você tem um novo seguidor"
   youReceivedFollowRequest: "Você recebeu um pedido de seguimento"
   yourFollowRequestAccepted: "Seu pedido de seguimento foi aceito"
-  youWereInvitedToGroup: "{userName} te convidou para um grupo"
   pollEnded: "Os resultados da enquete agora estão disponíveis"
   emptyPushNotificationMessage: "As notificações de alerta foram atualizadas"
   _types:
@@ -545,7 +531,6 @@ _notification:
     pollEnded: "Enquetes terminando"
     receiveFollowRequest: "Recebeu pedidos de seguimento"
     followRequestAccepted: "Aceitou pedidos de seguimento"
-    groupInvited: "Convites de grupo"
     app: "Notificações de aplicativos conectados"
   _actions:
     followBack: "te seguiu de volta"

locales/ro-RO.yml

@@ -107,6 +107,7 @@ clickToShow: "Click pentru a afișa"
 sensitive: "NSFW"
 add: "Adaugă"
 reaction: "Reacție"
+reactions: "Reacție"
 reactionSetting: "Reacții care să apară in selectorul de reacții"
 reactionSettingDescription2: "Trage pentru a rearanja, apasă pe \"+\" pentru a adăuga."
 rememberNoteVisibility: "Amintește setarea de vizibilitate a notelor"
@@ -381,12 +382,9 @@ about: "Despre"
 aboutMisskey: "Despre Misskey"
 administrator: "Administrator"
 token: "Token"
-twoStepAuthentication: "Autentificare în doi pași"
 moderator: "Moderator"
 nUsersMentioned: "Menționat de {n} utilizatori"
 securityKey: "Cheie de securitate"
-securityKeyName: "Numele cheii"
-registerSecurityKey: "Înregistrează o cheie de securitate"
 lastUsed: "Ultima utilizată"
 unregister: "Dezînregistrează"
 passwordLessLogin: "Autentificare fără parolă"
@@ -404,24 +402,15 @@ markAsReadAllTalkMessages: "Marchează toate mesajele drept citit"
 help: "Ajutor"
 inputMessageHere: "Introdu un mesaj aici"
 close: "Închide"
-group: "Grup"
-groups: "Grupuri"
-createGroup: "Crează un grup"
-ownedGroups: "Grupuri deținute"
-joinedGroups: "Grupuri alăturate"
 invites: "Invită"
-groupName: "Numele grupului"
 members: "Membri"
 transfer: "Transferă"
-messagingWithUser: "Chat privat"
-messagingWithGroup: "Chat de grup"
 title: "Titlu"
 text: "Text"
 enable: "Activează"
 next: "Următorul"
 retype: "Introdu din nou"
 noteOf: "Notă de {user}"
-inviteToGroup: "Invită în grup"
 quoteAttached: "Citat"
 quoteQuestion: "Vrei să adaugi ca citat?"
 noMessagesYet: "Niciun mesaj încă"
@@ -443,18 +432,13 @@ passwordMatched: "Se potrivește!"
 passwordNotMatched: "Nu se potrivește"
 signinWith: "Autentifică-te cu {x}"
 signinFailed: "Nu se poate autentifica. Numele de utilizator sau parola introduse sunt incorecte."
-tapSecurityKey: "Apasă pe cheia ta de securitate."
 or: "Sau"
 language: "Limbă"
 uiLanguage: "Limba interfeței"
-groupInvited: "Ai fost invitat într-un grup"
 aboutX: "Despre {x}"
 disableDrawer: "Nu folosi meniuri în stil sertar"
-youHaveNoGroups: "Nu ai niciun grup"
-joinOrCreateGroup: "Primește o invitație într-un grup sau creează unul nou."
 noHistory: "Nu există istoric"
 signinHistory: "Istoric autentificări"
-disableAnimatedMfm: "Dezactivează MFM cu animații"
 doing: "Se procesează..."
 category: "Categorie"
 tags: "Etichete"
@@ -648,14 +632,12 @@ sent: "Trimite"
 searchByGoogle: "Caută"
 file: "Fișiere"
 show: "Arată"
+_role:
+  _priority:
+    middle: "Mediu"
 _email:
   _follow:
     title: "te-a urmărit"
-_mfm:
-  mention: "Mențiune"
-  quote: "Citează"
-  emoji: "Emoji personalizat"
-  search: "Caută"
 _theme:
   description: "Descriere"
   keys:
@@ -701,7 +683,6 @@ _pages:
     image: "Imagini"
 _notification:
   youWereFollowed: "te-a urmărit"
-  youWereInvitedToGroup: "Ai fost invitat într-un grup"
   _types:
     follow: "Urmărești"
     mention: "Mențiune"
@@ -717,4 +698,5 @@ _deck:
     tl: "Cronologie"
     antenna: "Antene"
     list: "Liste"
+    channel: "Canale"
     mentions: "Mențiuni"

locales/ru-RU.yml

@@ -2,16 +2,18 @@
 _lang_: "Русский"
 headlineMisskey: "Сеть, сплетённая из заметок"
 introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
+poweredByMisskeyDescription: "{name} – один из инстансов (также называемый экземпляром Misskey), использующий платформу с открытым исходным кодом <b>Misskey</b>."
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 notifications: "Уведомления"
 username: "Имя пользователя"
 password: "Пароль"
-forgotPassword: "Пароль забыт"
+forgotPassword: "Забыли пароль?"
 fetchingAsApObject: "Приём с других сайтов"
 ok: "Окей"
 gotIt: "Ясно!"
 cancel: "Отмена"
+noThankYou: "Нет, спасибо"
 enterUsername: "Введите имя пользователя"
 renotedBy: "{user} делится"
 noNotes: "Нет ни одной заметки"
@@ -20,7 +22,7 @@ instance: "Инстанс"
 settings: "Настройки"
 basicSettings: "Основные настройки"
 otherSettings: "Прочие настройки"
-openInWindow: "Открывать в плавающих окнах"
+openInWindow: "Открыть в плавающем окне"
 profile: "Профиль"
 timeline: "Лента"
 noAccountDescription: "Пользователь ничего не написал про себя"
@@ -47,6 +49,7 @@ deleteAndEdit: "Удалить и отредактировать"
 deleteAndEditConfirm: "Удалить эту заметку и создать отредактированную? Все реакции, ссылки и ответы на существующую будут будут потеряны."
 addToList: "Добавить в список"
 sendMessage: "Отправить сообщение"
+copyRSS: "Скопировать RSS"
 copyUsername: "Скопировать имя пользователя"
 searchUser: "Поиск людей"
 reply: "Ответить"
@@ -100,6 +103,8 @@ renoted: "Репост совершён."
 cantRenote: "Это нельзя репостить."
 cantReRenote: "Невозможно репостить репост."
 quote: "Цитата"
+inChannelRenote: "В канале"
+inChannelQuote: "Заметки в канале"
 pinnedNote: "Закреплённая заметка"
 pinned: "Закрепить в профиле"
 you: "Вы"
@@ -107,6 +112,7 @@ clickToShow: "Нажмите для просмотра"
 sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
+reactions: "Реакции"
 reactionSetting: "Реакции, отображаемые в палитре"
 reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
@@ -125,6 +131,7 @@ unblockConfirm: "Разблокировать этот аккаунт?"
 suspendConfirm: "Заморозить этот аккаунт?"
 unsuspendConfirm: "Разморозить этот аккаунт?"
 selectList: "Выберите список"
+selectChannel: "Выберите канал"
 selectAntenna: "Выберите антенну"
 selectWidget: "Выберите виджет"
 editWidgets: "Редактировать виджеты"
@@ -252,6 +259,8 @@ noMoreHistory: "История закончилась"
 startMessaging: "Начать общение"
 nUsersRead: "Прочитали {n}"
 agreeTo: "Я соглашаюсь с {0}"
+agreeBelow: "Согласен со следующими"
+basicNotesBeforeCreateAccount: "Записи, перед созданием аккаунта"
 tos: "Пользовательское соглашение"
 start: "Начать"
 home: "Главная"
@@ -269,7 +278,7 @@ light: "Светлый"
 dark: "Тёмный"
 lightThemes: "Светлые темы"
 darkThemes: "Тёмные темы"
-syncDeviceDarkMode: "Синхронизировать с темным режимом устройства"
+syncDeviceDarkMode: "Синхронизировать с тёмной темой системы"
 drive: "Диск"
 fileName: "Имя файла"
 selectFile: "Выберите файл"
@@ -347,6 +356,8 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Включить reCAPTCHA"
 recaptchaSiteKey: "Ключ сайта"
 recaptchaSecretKey: "Секретный ключ"
+turnstile: "Сервис Turnstile"
+enableTurnstile: "Включить Turnstile"
 turnstileSiteKey: "Ключ сайта"
 turnstileSecretKey: "Секретный ключ"
 avoidMultiCaptchaConfirm: "Несколько способов проверки могут мешать друг другу. Подтвердите, если хотите отключить другие способы. Или нажмите «Отмена», чтобы оставить их включёнными."
@@ -382,13 +393,10 @@ about: "Описание"
 aboutMisskey: "О Misskey"
 administrator: "Администратор"
 token: "Токен"
-twoStepAuthentication: "Двухфакторная аутентификация"
 moderator: "Модератор"
 moderation: "Модерация"
 nUsersMentioned: "Упомянуло пользователей: {n}"
 securityKey: "Ключ безопасности"
-securityKeyName: "Имя ключа"
-registerSecurityKey: "Зарегистрировать защитный ключ"
 lastUsed: "Последнее использование"
 unregister: "Отписаться"
 passwordLessLogin: "Настроить вход без пароля"
@@ -406,24 +414,15 @@ markAsReadAllTalkMessages: "Отметить все реплики как про
 help: "Помощь"
 inputMessageHere: "Введите сообщение здесь"
 close: "Закрыть"
-group: "Группа"
-groups: "Группы"
-createGroup: "Создать группу"
-ownedGroups: "Собственные группы"
-joinedGroups: "Участие в группах"
 invites: "Приглашения"
-groupName: "Название группы"
 members: "Участники"
 transfer: "Отдать"
-messagingWithUser: "Общение с другим пользователем"
-messagingWithGroup: "Общение в группе"
 title: "Заголовок"
 text: "Текст"
 enable: "Включить"
 next: "Дальше"
 retype: "Введите ещё раз"
 noteOf: "Что пишет {user}"
-inviteToGroup: "Пригласить в группу"
 quoteAttached: "Цитата"
 quoteQuestion: "Хотите добавить цитату?"
 noMessagesYet: "Пока ни одного сообщения"
@@ -445,18 +444,17 @@ passwordMatched: "Совпали"
 passwordNotMatched: "Не совпадают"
 signinWith: "Использовать {x} для входа"
 signinFailed: "Невозможно войти в систему. Введенное вами имя пользователя или пароль неверны."
-tapSecurityKey: "Нажмите на свой электронный ключ"
 or: "или"
 language: "Язык"
 uiLanguage: "Язык интерфейса"
-groupInvited: "Приглашение в группу"
 aboutX: "Описание {x}"
+emojiStyle: "Стиль эмодзи"
+native: "Системные"
 disableDrawer: "Не использовать выдвижные меню"
-youHaveNoGroups: "У вас нет ни одной группы"
-joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные"
 noHistory: "История пока пуста"
 signinHistory: "Журнал посещений"
-disableAnimatedMfm: "Отключение анимированной разметки MFM"
+enableAdvancedMfm: "Включить расширенный MFM"
+enableAnimatedMfm: "Включить анимированную разметку MFM"
 doing: "В процессе"
 category: "Категория"
 tags: "Метки"
@@ -598,6 +596,7 @@ smtpSecureInfo: "Выключите при использовании STARTTLS."
 testEmail: "Проверка доставки электронной почты"
 wordMute: "Скрытие слов"
 regexpError: "Ошибка в регулярном выражении"
+regexpErrorDescription: "В списке {tab} скрытых слов, в строке {line} обнаружена синтаксическая ошибка:"
 instanceMute: "Глушение инстансов"
 userSaysSomething: "{name} что-то сообщает"
 makeActive: "Активировать"
@@ -708,6 +707,7 @@ accentColor: "Акцент"
 textColor: "Текст"
 saveAs: "Сохранить под названием…"
 advanced: "Для продвинутых"
+advancedSettings: "Расширенные настройки "
 value: "Значения"
 createdAt: "Создано"
 updatedAt: "Обновлено"
@@ -798,7 +798,7 @@ translate: "Перевод"
 translatedFrom: "Перевод. Язык оригинала — {x}"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
 usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
-aiChanMode: "ИИ режим"
+aiChanMode: "Режим Ай"
 keepCw: "Сохраняйте Предупреждения о содержимом"
 pubSub: "Учётные записи Pub/Sub"
 lastCommunication: "Последнее сообщение"
@@ -815,8 +815,8 @@ manageAccounts: "Управление аккаунтом"
 makeReactionsPublic: "Опубликовать список реакций"
 makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра всем желающим."
 classic: "Классика"
-muteThread: "Заглушить цепочку"
-unmuteThread: "Отменить глушение цепочки"
+muteThread: "Скрыть цепочку"
+unmuteThread: "Отменить сокрытие цепочки"
 ffVisibility: "Видимость подписок и подписчиков"
 ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и подписчиков."
 continueThread: "Показать следующие ответы"
@@ -824,8 +824,6 @@ deleteAccountConfirm: "Учётная запись будет безвозвра
 incorrectPassword: "Пароль неверен."
 voteConfirm: "Отдать голос за «{choice}»?"
 hide: "Спрятать"
-leaveGroup: "Покинуть группу"
-leaveGroupConfirm: "Покинуть группу «{name}»?"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
 welcomeBackWithName: "С возвращением, {name}!"
 clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
@@ -839,37 +837,412 @@ numberOfColumn: "Количество столбцов"
 searchByGoogle: "Поиск"
 instanceDefaultLightTheme: "Светлая тема по умолчанию"
 instanceDefaultDarkTheme: "Темная тема по умолчанию"
+instanceDefaultThemeDescription: "Описание темы по умолчанию для инстанса"
 mutePeriod: "Продолжительность скрытия"
 indefinitely: "вечно"
 tenMinutes: "10 минут"
 oneHour: "1 час"
 oneDay: "1 день"
 oneWeek: "1 неделя"
+reflectMayTakeTime: "Изменения могут занять время для отображения"
+failedToFetchAccountInformation: "Не удалось получить информацию об аккаунте"
+rateLimitExceeded: "Ограничение скорости превышено"
 cropImage: "Кадрирование"
 cropImageAsk: "Нужно ли кадрировать изображение?"
+cropYes: "Обрезать"
+cropNo: "Не обрезать"
 file: "Файлы"
 recentNHours: "Последние {n} ч"
 recentNDays: "Последние {n} сут"
+noEmailServerWarning: "Почтовый сервер не установлен "
+thereIsUnresolvedAbuseReportWarning: "Остались нерешённые жалобы"
 recommended: "Рекомендуем"
 check: "Проверить"
 driveCapOverrideLabel: "Изменение лимита дискового пространства для этого пользователя"
+driveCapOverrideCaption: "Укажите меньше или равное нулю для отмены"
+requireAdminForView: "Для просмотра необходимо иметь аккаунт администратора"
+isSystemAccount: "Данная учётная запись создана автоматически и управляется системой"
+typeToConfirm: "Введите {x} для продолжения"
 deleteAccount: "Удаление учётной записи"
+document: "Документ"
+numberOfPageCache: "Количество сохранённых страниц в кэше"
+numberOfPageCacheDescription: "Описание количества страниц в кэше"
+logoutConfirm: "Вы хотите выйти из аккаунта?"
+lastActiveDate: "Последняя дата использования"
+statusbar: "Статусбар"
+pleaseSelect: "Пожалуйста, выберите"
 reverse: "Переворот"
 colored: "Выделена цветом"
+refreshInterval: "Интервал перезагрузки"
 label: "Метка"
+type: "Тип"
+speed: "Скорость"
+slow: "Медленная"
+fast: "Быстрая"
+sensitiveMediaDetection: "Определение содержимого деликатного характера"
 localOnly: "Локально"
+remoteOnly: "Только удалённо"
+failedToUpload: "Сбой выгрузки"
+cannotUploadBecauseInappropriate: "Файл не может быть загружен, так как было установлено, что он может содержать неприемлемое содержимое."
+cannotUploadBecauseNoFreeSpace: "Файл не может быть загружен, так как не осталось места на диске"
 beta: "Бета"
 enableAutoSensitive: "Автоматическое определение NSFW"
 enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта."
+activeEmailValidationDescription: "Если включено, будет проводиться более строгая проверка адреса электронной почты, в том числе на то, что он действительный и не временный. Если же отключено, то проверяется только корректность написания адреса."
+navbar: "Панель навигации"
+shuffle: "Перемешать"
 account: "Учётные записи"
+move: "Переместить"
+pushNotification: "Push-уведомления"
+subscribePushNotification: "Включить push-уведомления"
+unsubscribePushNotification: "Выключить push-уведомления"
+pushNotificationAlreadySubscribed: "Push-уведомления уже включены"
+pushNotificationNotSupported: "Push-уведмления не поддерживаются инстансом или браузером"
+sendPushNotificationReadMessage: "Удалять push-уведомления когда сообщение или прочитано"
+sendPushNotificationReadMessageCaption: "На мгновение появится уведомление \"{emptyPushNotificationMessage}\". Расход заряда батареи может увеличиться "
 windowMaximize: "Развернуть"
 windowRestore: "Восстановить"
+caption: "Подпись (Automatic Translation)"
+loggedInAsBot: "Вы под аккаунтом бота!"
+tools: "Инструменты"
+cannotLoad: "Не удалось загрузить"
+numberOfProfileView: "Количество профилей для просмотра"
 like: "Нравится!"
+unlike: "Отменить «нравится»"
+numberOfLikes: "Количество лайков"
 show: "Отображение"
+neverShow: "Больше не показывать"
+remindMeLater: "Напомнить позже"
+didYouLikeMisskey: "Вам нравится Misskey?"
+pleaseDonate: "Сайт {host} работает на Misskey. Это бесплатное программное обеспечение, и ваши пожертвования очень бы помогли продолжать его разработку!"
+roles: "Роли"
+role: "Роль"
+normalUser: "Обычный пользователь"
+undefined: "неопределён"
+assign: "Назначить"
+unassign: "Отменить назначение"
 color: "Цвет"
+manageCustomEmojis: "Управлять пользовательскими эмодзи"
+youCannotCreateAnymore: "Вы достигли лимита создания."
+cannotPerformTemporary: "Временно недоступен"
+cannotPerformTemporaryDescription: "Это действие временно невозможно выполнить из-за превышения лимита выполнения."
+preset: "Шаблоны"
+selectFromPresets: "Выбрать из шаблонов"
+achievements: "Достижения"
+gotInvalidResponseError: "Сервер ответил ошибкой"
+gotInvalidResponseErrorDescription: "Сервер временно не доступен. Возможно проводятся технические работы, или сервер отключен."
+thisPostMayBeAnnoying: "Это сообщение может быть неприятным."
+thisPostMayBeAnnoyingHome: "Этот пост может быть отправлен на главную"
+thisPostMayBeAnnoyingCancel: "Этот пост не может быть отменен."
+thisPostMayBeAnnoyingIgnore: "Этот пост может быть проигнорирован "
+collapseRenotes: "Свернуть репосты"
+internalServerError: "Внутренняя ошибка сервера"
+internalServerErrorDescription: "Внутри сервера произошла непредвиденная ошибка."
+copyErrorInfo: "Скопировать код ошибки"
+_achievements:
+  earnedAt: "Разблокировано в"
+  _types:
+    _notes1:
+      title: "Первые шаги в Misskey"
+      description: "Опубликована первая заметка"
+      flavor: "Приятных дней с Misskey!"
+    _notes10:
+      title: "Несколько заметок"
+      description: "Опубликовано 10 заметок"
+    _notes100:
+      title: "Много заметок"
+      description: "Опубликовано 100 заметок"
+    _notes500:
+      title: "Всё в заметках"
+      description: "Опубликовано 500 заметок"
+    _notes1000:
+      title: "Гора заметок"
+      description: "Опубликовано 1000 заметок"
+    _notes5000:
+      title: "Заметки льются рекой"
+      description: "Опубликовано 5000 заметок"
+    _notes10000:
+      title: "Превосходство в заметках"
+      description: "Опубликовано 10 000 заметок"
+    _notes20000:
+      title: "Нужно больше заметок!"
+      description: "Опубликовано 20 000 заметок"
+    _notes30000:
+      title: "Заметки, заметки, заметки"
+      description: "Опубликовано 30 000 заметок"
+    _notes40000:
+      title: "Фабрика заметок"
+      description: "Опубликовано 40 000 заметок"
+    _notes50000:
+      title: "Планета заметок"
+      description: "Опубликовано 50 000 заметок"
+    _notes60000:
+      title: "Замет-квазар"
+      description: "Опубликовано 60 000 заметок"
+    _notes70000:
+      title: "Чёрная дыра из заметок"
+      description: "Опубликовано 70 000 заметок"
+    _notes80000:
+      title: "Галактика заметок"
+      description: "Опубликовано 80 000 заметок"
+    _notes90000:
+      title: "Вселенная заметок"
+      description: "Опубликовано 90 000 заметок"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Опубликовано 100 000 заметок"
+      flavor: "Вам правда нужно столько писать?"
+    _login3:
+      title: "Новичок Ⅰ"
+      description: "3 дня на сайте"
+      flavor: "С сегодняшнего дня зовите меня просто мискиец"
+    _login7:
+      title: "Новичок Ⅱ"
+      description: "Неделя на сайте"
+      flavor: "Кажется, вы начали свыкаться с этим, нет?"
+    _login15:
+      title: "Новичок Ⅲ"
+      description: "15 дней на сайте"
+    _login30:
+      title: "Мискиец Ⅰ"
+      description: "30 дней на сайте"
+    _login60:
+      title: "Мискиец Ⅱ"
+      description: "60 дней на сайте"
+    _login100:
+      title: "Мискиец Ⅲ"
+      description: "100 дней на сайте"
+      flavor: "Жестокий мискиец"
+    _login200:
+      title: "Завсегдатай Ⅰ"
+      description: "200 дней на сайте"
+    _login300:
+      title: "Завсегдатай Ⅱ"
+      description: "300 дней на сайте"
+    _login400:
+      title: "Завсегдатай Ⅲ"
+      description: "400 дней на сайте"
+    _login500:
+      title: "Ветеран Ⅰ"
+      description: "500 дней на сайте"
+      flavor: "Господа, я люблю заметки"
+    _login600:
+      title: "Ветеран Ⅱ"
+      description: "600 дней на сайте"
+    _login700:
+      title: "Ветеран Ⅲ"
+      description: "700 дней на сайте"
+    _login800:
+      title: "Повелитель заметок Ⅰ"
+      description: "800 дней на сайте"
+    _login900:
+      title: "Повелитель заметок Ⅱ"
+      description: "900 дней на сайте"
+    _login1000:
+      title: "Повелитель заметок Ⅲ"
+      description: "1000 дней на сайте"
+      flavor: "Спасибо, что пользуетесь Misskey!"
+    _noteClipped1:
+      title: "Нельзя не сохранить"
+      description: "Первая заметка в подборке"
+    _noteFavorited1:
+      title: "Смотрящий на звёзды"
+      description: "Первое добавление в избранное"
+    _myNoteFavorited1:
+      title: "В поиске звёзд"
+      description: "Кому-то понравилась ваша заметка"
+    _profileFilled:
+      title: "Приготовления закончены"
+      description: "Заполнен профиль"
+    _markedAsCat:
+      title: "Ваш покорный слуга кот"
+      description: "Включена опция «Аккаунт кота»"
+      flavor: "Позвольте представиться: я — кот, просто кот, у меня еще нет имени."
+    _following1:
+      title: "Я не один"
+      description: "Сделана первая подписка"
+    _following10:
+      title: "Не останавливайся… Не останавливайся…"
+      description: "Количество подписок достигло 10"
+    _following50:
+      title: "Много друзей"
+      description: "Количество подписок достигло 50"
+    _following100:
+      title: "Сотня друзей"
+      description: "Количество подписок достигло 100"
+    _following300:
+      title: "Друзья в избытке"
+      description: "Количество подписок достигло 300"
+    _followers1:
+      title: "Первый подписчик"
+      description: "Появился 1 подписчик"
+    _followers10:
+      title: "Следуй за мной!"
+      description: "Количество подписчиков достигло 10"
+    _followers50:
+      title: "Один за другим"
+      description: "Количество подписчиков достигло 50"
+    _followers100:
+      title: "Всеобщий любимец"
+      description: "Количество подписчиков достигло 100"
+    _followers300:
+      title: "В очередь!"
+      description: "Количество подписчиков достигло 300"
+    _followers500:
+      title: "Радиостанция"
+      description: "Количество подписчиков достигло 500"
+    _followers1000:
+      title: "Авторитет"
+      description: "Количество подписчиков достигло 1000"
+    _collectAchievements30:
+      title: "Достигатор"
+      description: "Получено 30 достижений"
+    _viewAchievements3min:
+      title: "Любовь к успехам"
+      description: "Более 3 минут любования достижениями"
+    _iLoveMisskey:
+      title: "Я люблю Misskey"
+      description: "Написана заметка «I ❤ #Misskey»"
+      flavor: "Спасибо за поддержку Misskey! Ваша команда разработчиков"
+    _foundTreasure:
+      title: "Охота за сокровищами"
+      description: "Найдено спрятанное сокровище"
+    _client30min:
+      title: "Перерыв на обед"
+      description: "Прошло 30 минут с момента запуска клиента"
+    _noteDeletedWithin1min:
+      title: "Ой, нет!"
+      description: "Заметка удалена через минуту после публикации"
+    _postedAtLateNight:
+      title: "Житель ночи"
+      description: "Заметка опубликована в глухую ночь"
+      flavor: "Вроде бы пора спать"
+    _postedAt0min0sec:
+      title: "Говорящие часы"
+      description: "Заметка опубликована ровно в 0 минут 0 секунд"
+      flavor: "Дин-дон дин-дон"
+    _selfQuote:
+      title: "Самовоспроизведение"
+      description: "Процитирована собственная заметка"
+    _htl20npm:
+      title: "В потоке"
+      description: "Достигнута скорость домашней ленты в 20 з/мин (заметок минуту)"
+    _viewInstanceChart:
+      title: "Аналитик"
+      description: "Просмотрены статистические диаграммы инстанса"
+    _outputHelloWorldOnScratchpad:
+      title: "Привет, мир!"
+      description: "Выведен текст «hello world» в Когтеточке"
+    _open3windows:
+      title: "Многооконный"
+      description: "Открыто одновременно 3 окна"
+    _driveFolderCircularReference:
+      title: "Циклическая ссылка"
+      description: "Попытка создать на «диске» рекурсивно вложенную папку"
+    _reactWithoutRead:
+      title: "Не читай @ отвечай!"
+      description: "На заметку более чем 100 знаков написан ответ в первые же 3 секунды с её появления."
+    _clickedClickHere:
+      title: "Нажмите здесь"
+      description: "Нажато здесь"
+    _justPlainLucky:
+      title: "Чистая удача"
+      description: "Может достаться с вероятностью 0,01% каждые 10 секунд."
+    _setNameToSyuilo:
+      title: "Комплекс бога"
+      description: "Установлено «syuilo» в качестве имени"
+    _passedSinceAccountCreated1:
+      title: "Первая годовщина"
+      description: "Прошёл 1 год с момента регистрации"
+    _passedSinceAccountCreated2:
+      title: "Вторая годовщина"
+      description: "Прошло 2 года с момента регистрации"
+    _passedSinceAccountCreated3:
+      title: "Третья годовщина"
+      description: "Прошло 3 года с момента регистрации"
+    _loggedInOnBirthday:
+      title: "С днём рождения!"
+      description: "Вход на сайт в свой день рождения"
+    _loggedInOnNewYearsDay:
+      title: "С Новым годом!"
+      description: "Вход на сайт в первый день года"
+      flavor: "Желаем отличного года на нашем сайте!"
+    _cookieClicked:
+      title: "Игра, в которой вы щёлкаете по печенькам"
+      description: "Нажато печенье"
+      flavor: "Стоп, вы вообще на том сайте-то?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Опубликована ссылка на песню «Brain Diver»"
+      flavor: "Мисски-Мисски Ла-Ту-Ма"
+_role:
+  new: "Новая роль"
+  edit: "Изменить роль"
+  name: "Название роли"
+  description: "Описание роли"
+  permission: "Ролевые полномочия"
+  descriptionOfPermission: "<b>Модераторы</b> могут изменять базовые операции для модераторов.\n<b>Администраторы</b> могут изменять полностью настройки инстанса."
+  assignTarget: "Метод присвоения"
+  descriptionOfAssignTarget: "<b>Вручную</b> чтобы указать кому выдавать роль, а кому нет.\n<b>По условию<b> чтобы автоматически выдавать и удалять роль при условиях."
+  manual: "Вручную"
+  conditional: "По условию"
+  condition: "Условия"
+  isConditionalRole: "Эта роль выдаётся по условию."
+  isPublic: "Общедоступная роль"
+  descriptionOfIsPublic: "Список тех, кому назначена эта роль будет доступен всем. Кроме того эта роль будет отмечена у каждого в профиле."
+  options: "Настройки ролей"
+  policies: "Политики"
+  baseRole: "Шаблон роли"
+  useBaseValue: "Использовать значение из шаблона"
+  chooseRoleToAssign: "Выберите роль, которую хотите выдать"
+  iconUrl: "Адрес на иконку роли"
+  asBadge: "Показывать как значок"
+  descriptionOfAsBadge: "Описание значка"
+  canEditMembersByModerator: "Могут назначать модераторы"
+  descriptionOfCanEditMembersByModerator: "Если включено, на эту роль могут назначать пользователей как администраторы, так и модераторы. Если выключено, назначать могут только администраторы."
+  priority: "Приоритет"
+  _priority:
+    low: "Низкий"
+    middle: "Средне"
+    high: "Высокий"
+  _options:
+    gtlAvailable: "Может просматривать глобальную ленту"
+    ltlAvailable: "Может просматривать местную ленту"
+    canPublicNote: "Может публиковать общедоступные заметки"
+    canInvite: "Может создавать пригласительные коды"
+    canManageCustomEmojis: "Управлять пользовательскими эмодзи"
+    driveCapacity: "Доступное пространство на «диске»"
+    pinMax: "Доступное количество закреплённых заметок"
+    antennaMax: "Доступное количество антенн"
+    wordMuteMax: "Доступное количество знаков в списке скрытия слов"
+    webhookMax: "Максимум web-хуков"
+    clipMax: "Максимальное количество подборок"
+    noteEachClipsMax: "Максимальное количество заметок в подборке"
+    userListMax: "Максимальное количество списков аккаунтов"
+    userEachUserListsMax: "Максимальное количество аккаунтов в списке"
+    rateLimitFactor: "Ограничение активности"
+    descriptionOfRateLimitFactor: "Меньшее значение — слабые ограничения, большее — сильные"
+    canHideAds: "Может скрыть рекламу"
+  _condition:
+    isLocal: "Местный"
+    isRemote: "Неместный"
+    createdLessThan: "Аккаунт младше, чем..."
+    createdMoreThan: "Аккаунт старше, чем..."
+    followersLessThanOrEq: "Количество подписчиков не превышает…"
+    followersMoreThanOrEq: "Количество подписчиков не меньше чем…"
+    followingLessThanOrEq: "Количество подписок не превышает…"
+    followingMoreThanOrEq: "Количество подписок не меньше чем…"
+    and: "Выполнено несколько условий:.."
+    or: "Выполнено любое из условий:.."
+    not: "Кроме тех, у кого…"
 _sensitiveMediaDetection:
   description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
+  sensitivity: "Чувствительность обнаружения"
+  sensitivityDescription: "Более низкая чувствительность уменьшает количество ложных срабатываний (false positives). Повышение чувствительности уменьшает утечку при обнаружении (ложноотрицательные результаты)."
   setSensitiveFlagAutomatically: "Установить флаг NSFW"
+  setSensitiveFlagAutomaticallyDescription: "Даже если этот параметр отключен, результат оценки сохраняется внутри системы."
+  analyzeVideos: "Анализировать видео?"
+  analyzeVideosDescription: "Анализируйте видео в дополнение к неподвижным изображениям. Нагрузка на сервер немного увеличивается."
 _emailUnavailable:
   used: "Уже используется"
   format: "Неверный формат"
@@ -894,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "Выход"
   reduceFrequencyOfThisAd: "Реже показывать эту рекламу"
+  hide: "Не показывать"
 _forgotPassword:
   enterEmail: "Введите адрес электронной почты, который ввели при регистрации. На неё будет выслана ссылка для смены пароля."
   ifNoEmail: "Если вы не ввели свой адрес электронной почты, свяжитесь с администратором ресурса, чтобы сменить пароль."
@@ -912,6 +1286,24 @@ _plugin:
   install: "Установка расширений"
   installWarn: "Пожалуйста, не устанавливайте расширения, которым не доверяете."
   manage: "Управление расширениями"
+_preferencesBackups:
+  list: "Существующие резервные копии"
+  saveNew: "Создать резервную копию"
+  loadFile: "Прочесть из файла"
+  apply: "Восстановить на это устройство"
+  save: "Обновить из текущих настроек"
+  inputName: "Введите название для резервной копии"
+  cannotSave: "Сохранить не удалось"
+  nameAlreadyExists: "Резервная копия под названием «{name}» уже существует. Придумайте другое."
+  applyConfirm: "Правда хотите загрузить резервную копию «{name}» на это устройство? Этим будут потеряны текущие настройки."
+  saveConfirm: "Сохранить резервную копию под названием «{name}»?"
+  deleteConfirm: "Удалить резервную копию «{name}»?"
+  renameConfirm: "Переименовать резервную копию «{old}» в «{new}»?"
+  noBackups: "Здесь ещё нет резервных копий. Вы можете создать резервную копию настроек на этом сайте с помощью кнопки «Создать резервную копию»."
+  createdAt: "Создана {date} в {time}"
+  updatedAt: "Обновлена {date} в {time}"
+  cannotLoad: "Загрузить не удалось"
+  invalidFile: "Некорректный формат файла"
 _registry:
   scope: "Область"
   key: "Ключ"
@@ -931,70 +1323,6 @@ _nsfw:
   respect: "Скрывать содержимое не для всех"
   ignore: "Показывать содержимое не для всех"
   force: "Скрывать вообще все файлы"
-_mfm:
-  cheatSheet: "Подсказка по разметке MFM"
-  intro: "MFM — язык оформления текста, который придуман специально для Misskey и готов для применения во многих местах. На этой странице собраны и кратко изложены способы его использовать."
-  dummy: "Misskey расширяет границы Федиверса."
-  mention: "Упоминание"
-  mentionDescription: "При помощи знака «собака» перед именем можно упомянуть какого-нибудь пользователя."
-  hashtag: "Хэштег"
-  hashtagDescription: "При помощи знака «решётка» перед словом задаётся хэштег."
-  url: "Простая ссылка (URL)"
-  urlDescription: "Ссылки могут отображаться непосредственно."
-  link: "Ссылка с пояснением"
-  linkDescription: "Можно ссылку оформить в виде произвольного текста."
-  bold: "Жирный шрифт"
-  boldDescription: "Выделяет текст, делая буквы жирнее."
-  small: "Мелкий шрифт"
-  smallDescription: "Делает текст маленьким и незаметным."
-  center: "Выровнять элементы по центру"
-  centerDescription: "Так можно выровнять что-то по центру."
-  inlineCode: "Программа (в тексте)"
-  inlineCodeDescription: "Подсвечивает фрагмент программы внутри сплошного текста."
-  blockCode: "Программа (блок)"
-  blockCodeDescription: "Оформляет текст программы в виде отдельного блокоа. Он может состоять из множества строк."
-  inlineMath: "Математическое выражение (в тексте)"
-  inlineMathDescription: "Позволяет вставлять математические выражения внутрь текста при помощи языка KaTeX."
-  blockMath: "Математическое выражение (блок)"
-  blockMathDescription: "Оформляет математическое выражение (KaTeX) на отдельной строке."
-  quote: "Цитата"
-  quoteDescription: "Так можно процитировать чей-то текст."
-  emoji: "Собственные эмодзи"
-  emojiDescription: "Можно вставить эмодзи в текст, окружив название двоеточиями."
-  search: "Поиск"
-  searchDescription: "Можно добавить форму для поиска, сразу задав, что искать."
-  flip: "Переворот"
-  flipDescription: "Позволяет отразить текст зеркально по вертикали или горизонтали."
-  jelly: "Анимация желе (шлёп-плёп)"
-  jellyDescription: "Напоминает горку джема, дёргающуюся от шлепков."
-  tada: "Анимация (та-дам!)"
-  tadaDescription: "Получается нечто выпрыгивающее, как бы крича: «а вот и я!»"
-  jump: "Анимация прыжков (прыг-скок)"
-  jumpDescription: "Побуждает радостно подпрыгивать."
-  bounce: "Анимация отскоков (бум-бум)"
-  bounceDescription: "Это будет скакать как мяч."
-  shake: "Анимация дрожи (б-р-р-р)"
-  shakeDescription: "Такое дрожит, словно от холода. Или от страха."
-  twitch: "Анимация тряски"
-  twitchDescription: "Заставляет трястись как одержимого"
-  spin: "Вращение"
-  spinDescription: "Так можно крутить содержимое в разных направлениях."
-  x2: "Крупный шрифт"
-  x2Description: "Увеличивает содержимое."
-  x3: "Ещё крупнее"
-  x3Description: "Сильнее увеличивает содержимое."
-  x4: "Совсем крупно"
-  x4Description: "Увеличивает содержимое совсем сильно."
-  blur: "Размытие"
-  blurDescription: "Размывает текст до нечитаемости, будто его поместили за матовое стекло. Наведение указателя мыши на размытый текст возвращает чёткость."
-  font: "Шрифт"
-  fontDescription: "Так можно писать произвольным шрифтом."
-  rainbow: "Радуга"
-  rainbowDescription: "Заставлять содержимое отображаться в цветах радуги."
-  sparkle: "Искры"
-  sparkleDescription: "Добавляет эффект искрящихся частиц."
-  rotate: "Повернуть"
-  rotateDescription: "Поворачивает на заданный угол."
 _instanceTicker:
   none: "Не показывать"
   remote: "Только для других сайтов"
@@ -1024,12 +1352,14 @@ _wordMute:
   muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите их между двумя дробными чертами (/)."
   softDescription: "Соответствующие условиям заметки будут спрятаны из вашей ленты."
   hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не появятся."
-  soft: "Мягкий"
-  hard: "Жёсткий"
+  soft: "Мягко"
+  hard: "Жёстко"
   mutedNotes: "Скрытые заметки"
 _instanceMute:
+  instanceMuteDescription: "Заметки и репосты с указанных здесь инстансов, а также ответы пользователям оттуда же не будут отображаться."
+  instanceMuteDescription2: "Пишите каждый инстанс на отдельной строке"
   title: "Скрывает заметки с заданных инстансов."
-  heading: "Список заглушенных инстансов"
+  heading: "Список скрытых инстансов"
 _theme:
   explore: "Обзор"
   install: "Установить тему"
@@ -1150,15 +1480,19 @@ _tutorial:
   step7_1: "На этом вводный урок по использованию Misskey закончен. Спасибо, что прошли его до конца!"
   step7_2: "Хотите изучить Misskey глубже — добро пожаловать в раздел «{help}»."
   step7_3: "Приятно вам провести время с Misskey🚀"
+  step8_1: "Ах, да, не хотите ли включить push-уведомления?"
+  step8_2: "С push-уведомлениями вы будете в курсе репостов, ответов, реакций и всего такого, даже когда закрыли Misskey."
+  step8_3: "Эту настройку вы всегда сможете поменять"
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
-  registerDevice: "Зарегистрируйте ваше устройство"
-  registerKey: "Зарегистрировать ключ"
   step1: "Прежде всего, установите на устройство приложение для аутентификации, например, {a} или {b}."
   step2: "Далее отсканируйте отображаемый QR-код при помощи приложения."
+  step2Url: "Если пользуетесь приложением на компьютере, можете ввести в него эту строку (URL):"
   step3: "И наконец, введите код, который покажет приложение."
   step4: "Теперь при каждом входе на сайт вам нужно будет вводить код из приложения аналогичным образом."
   securityKeyInfo: "Вы можете настроить вход с помощью аппаратного ключа безопасности, поддерживающего FIDO2, или отпечатка пальца или PIN-кода на устройстве."
+  removeKeyConfirm: "Удалить резервную копию «{name}»?"
+  renewTOTPCancel: "Нет, спасибо"
 _permissions:
   "read:account": "Просматривать данные учётной записи"
   "write:account": "Изменять данные учётной записи"
@@ -1172,7 +1506,7 @@ _permissions:
   "write:following": "Изменять спискок подписок"
   "read:messaging": "Смотреть сообщения"
   "write:messaging": "Писать и удалять сообщения"
-  "read:mutes": "Смотреть спискок скрытых пользователей"
+  "read:mutes": "Смотреть список скрытых пользователей"
   "write:mutes": "Изменять список скрытых пользователей"
   "write:notes": "Писать и удалять заметки"
   "read:notifications": "Смотреть уведомления"
@@ -1193,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "Просмотр списка понравившегося в галерее"
   "write:gallery-likes": "Изменение списка понравившегося в галерее"
 _auth:
+  shareAccessTitle: "Разрешения для приложений"
   shareAccess: "Дать доступ для «{name}» к вашей учётной записи?"
   shareAccessAsk: "Уверены, что хотите дать приложению доступ к своей учётной записи?"
+  permission: "{name} Запрашивает следующие разрешения:"
   permissionAsk: "Приложение запрашивает следующие разрешения:"
   pleaseGoBack: "Вернитесь, пожалуйста, в приложение"
   callback: "Возврат в приложение"
   denied: "Доступ закрыт"
+  pleaseLogin: "Вы должны войти в систему, чтобы дать разрешение приложению."
 _antennaSources:
   all: "Все заметки"
   homeTimeline: "Заметки тех на которых вы подписаны"
   users: "Заметки выбранных пользователей"
   userList: "Заметки пользователей из выбранных списков"
-  userGroup: "Заметки от пользователей из заданной группы"
 _weekday:
   sunday: "Воскресенье"
   monday: "Понедельник"
@@ -1223,10 +1559,13 @@ _widgets:
   trends: "Актуальное"
   clock: "Часы"
   rss: "Просмотр RSS"
+  rssTicker: "Бегущая строка RSS"
   activity: "Активность"
   photos: "Фото"
   digitalClock: "Цифровые часы"
+  unixClock: "Часы UNIX"
   federation: "Федерация"
+  instanceCloud: "Облако инстансов"
   postForm: "Форма отправки"
   slideshow: "Показ слайдов"
   button: "Кнопка"
@@ -1234,9 +1573,12 @@ _widgets:
   jobQueue: "Очередь заданий"
   serverMetric: "Показатели сервера"
   aiscript: "Консоль AiScript"
+  aiscriptApp: "Приложение на AiScript"
   aichan: "Ай"
+  userList: "Список аккаунтов"
   _userList:
     chooseList: "Выберите список"
+  clicker: "Счётчик щелчков"
 _cw:
   hide: "Спрятать"
   show: "Показать еще"
@@ -1273,8 +1615,6 @@ _visibility:
   followersDescription: "Только вашим подписчикам"
   specified: "Личное"
   specifiedDescription: "Тем, кого укажете"
-  localOnly: "Локально"
-  localOnlyDescription: "Только для этого сайта"
 _postForm:
   replyPlaceholder: "Ответ на заметку..."
   quotePlaceholder: "Пояснение к цитате..."
@@ -1299,12 +1639,13 @@ _profile:
   changeAvatar: "Поменять аватар"
   changeBanner: "Поменять изображение в шапке"
 _exportOrImport:
-  allNotes: "Все записи\n"
+  allNotes: "Все заметки\n"
+  favoritedNotes: "Избранное"
   followingList: "Подписки"
   muteList: "Скрытые"
   blockingList: "Заблокированные"
   userLists: "Списки"
-  excludeMutingUsers: "За исключением заглушенных пользователей"
+  excludeMutingUsers: "За исключением скрытых пользователей"
   excludeInactiveUsers: "Без неактивных учётных записей"
 _charts:
   federation: "Федерация"
@@ -1338,7 +1679,16 @@ _timelines:
   social: "Социальная"
   global: "Всеобщая"
 _play:
+  new: "Создать приложение "
+  edit: "Редактировать приложение"
+  created: "Приложение создано"
+  updated: "Приложение обновлено"
+  deleted: "Приложение удалено"
+  pageSetting: "Настройки приложения"
+  editThisPage: "Отредактировать страницу"
   viewSource: "Просмотр исходника"
+  my: "Мои приложения "
+  liked: "Понравилось"
   featured: "Популярные"
   title: "Заголовок"
   script: "Скрипт"
@@ -1402,12 +1752,13 @@ _notification:
   youGotReply: "{name} отвечает вам."
   youGotQuote: "{name} цитирует вас."
   youRenoted: "{name} передаёт вашу заметку."
-  youGotMessagingMessageFromUser: "{name} пишет вам."
-  youGotMessagingMessageFromGroup: "Новое сообщение в группе «{name}»."
   youWereFollowed: "У вас новый подписчик."
   youReceivedFollowRequest: "У вас новый запрос на подписку."
   yourFollowRequestAccepted: "Ваш запрос на подписку одобрен."
-  youWereInvitedToGroup: "Вы приглашены в группу."
+  pollEnded: "Подведены окончательные итоги опроса"
+  unreadAntennaNote: "Антенна {name}"
+  emptyPushNotificationMessage: "Обновлены push-уведомления"
+  achievementEarned: "Получено достижение"
   _types:
     all: "Все"
     follow: "Подписки"
@@ -1416,11 +1767,12 @@ _notification:
     renote: "Репосты"
     quote: "Цитаты"
     reaction: "Реакции"
+    pollEnded: "Окончания опросов"
     receiveFollowRequest: "Получен запрос на подписку"
     followRequestAccepted: "Запрос на подписку одобрен"
-    groupInvited: "Приглашение в группы"
     app: "Уведомления из приложений"
   _actions:
+    followBack: "отвечает взаимной подпиской"
     reply: "Ответить"
     renote: "Репост"
 _deck:
@@ -1434,7 +1786,12 @@ _deck:
   swapDown: "Переставить ниже"
   stackLeft: "В столбик влево"
   popRight: "Из столбика вправо"
-  profile: "Профиль"
+  profile: "Расстановка"
+  newProfile: "Новая расстановка"
+  deleteProfile: "Удаление расстановки"
+  introduction: "Создайте идеальный интерфейс расставляя колонки как угодно"
+  introduction2: "Чтобы добавлять колонки в любом месте, жмите «+» справа экрана."
+  widgetsIntroduction: "Чтобы добавлять виджеты, выбирайте «Редактировать виджеты» в меню колонки."
   _columns:
     main: "Основная"
     widgets: "Виджеты"
@@ -1442,5 +1799,6 @@ _deck:
     tl: "Лента"
     antenna: "Антенны"
     list: "Списки"
+    channel: "Каналы"
     mentions: "Упоминания"
     direct: "Личное"

locales/sk-SK.yml

@@ -110,6 +110,7 @@ clickToShow: "Kliknutím zobrazíte"
 sensitive: "NSFW"
 add: "Pridať"
 reaction: "Reakcie"
+reactions: "Reakcie"
 reactionSetting: "Reakcie zobrazené vo výbere reakcií"
 reactionSettingDescription2: "Ťahaním preusporiadate, kliknutím odstránite, Stlačením \"+\" pridáte"
 rememberNoteVisibility: "Zapamätať nastavenia viditeľnosti poznámky"
@@ -387,13 +388,10 @@ about: "Informácie"
 aboutMisskey: "O Misskey"
 administrator: "Administrátor"
 token: "Token"
-twoStepAuthentication: "Dvojfaktorová autentifikácia"
 moderator: "Moderátor"
 moderation: "Moderovanie"
 nUsersMentioned: "{n} používateľov spomenulo"
 securityKey: "Bezpečnostný kľúč"
-securityKeyName: "Názov kľúča"
-registerSecurityKey: "Registrovať bezpečnostný kľúč"
 lastUsed: "Naposledy použité"
 unregister: "Odregistrovať"
 passwordLessLogin: "Nastaviť bezheslové prihlásenie"
@@ -411,24 +409,15 @@ markAsReadAllTalkMessages: "Označiť všetky správy ako prečítané"
 help: "Pomoc"
 inputMessageHere: "Sem napíšte správu"
 close: "Zavrieť"
-group: "Skupina"
-groups: "Skupiny"
-createGroup: "Vytvoriť skupinu"
-ownedGroups: "Vlastnené skupiny"
-joinedGroups: "Členstvo v skupinách"
 invites: "Pozvať"
-groupName: "Názov skupiny"
 members: "Členovia"
 transfer: "Presun"
-messagingWithUser: "Súkromný chat"
-messagingWithGroup: "Skupinový chat"
 title: "Nadpis"
 text: "Text"
 enable: "Povoliť"
 next: "Ďalší"
 retype: "Zadajte znovu"
 noteOf: "Poznámky používateľa {user}"
-inviteToGroup: "Pozvať do skupiny"
 quoteAttached: "Citované"
 quoteQuestion: "Pripojiť ako citát?"
 noMessagesYet: "Zatiaľ žiadne správy"
@@ -450,20 +439,15 @@ passwordMatched: "Heslá sú rovnaké"
 passwordNotMatched: "Heslá nie sú rovnaké"
 signinWith: "Prihlásiť sa použitím {x}"
 signinFailed: "Nedá sa prihlásiť. Skontrolujte prosím meno používateľa a heslo."
-tapSecurityKey: "Ťuknite na bezpečnostný kľúč"
 or: "Alebo"
 language: "Jazyk"
 uiLanguage: "Jazyk používateľského prostredia"
-groupInvited: "Pozvať do skupiny"
 aboutX: "O {x}"
 emojiStyle: "Štýl emoji"
 native: "Natívne"
 disableDrawer: "Nepoužívať šuflíkové menu"
-youHaveNoGroups: "Nemáte žiadne skupiny"
-joinOrCreateGroup: "Požiadajte o pozvanie do existujúcej skupiny alebo vytvorte novú."
 noHistory: "Žiadna história"
 signinHistory: "História prihlásení"
-disableAnimatedMfm: "Vypnúť MFM s animáciou"
 doing: "Pracujem..."
 category: "Kategórie"
 tags: "Značky"
@@ -832,8 +816,6 @@ deleteAccountConfirm: "Toto nezvrátiteľne vymaže váš účet. Pokračovať?"
 incorrectPassword: "Nesprávne heslo."
 voteConfirm: "Potvrdzujete svoj hlas za \"{choice}\"?"
 hide: "Skryť"
-leaveGroup: "Opustiť skupiny"
-leaveGroupConfirm: "Naozaj chcete opustiť \"{name}\"?"
 useDrawerReactionPickerForMobile: "Zobraziť výber reakcií ako šuflík na mobile"
 welcomeBackWithName: "Vitajte späť, {name}"
 clickToFinishEmailVerification: "Kliknutím na [{ok}] dokončíte overeniu emailu."
@@ -918,6 +900,12 @@ remindMeLater: "Pripomenúť neskôr"
 didYouLikeMisskey: "Páči sa vám Misskey?"
 pleaseDonate: "Misskey je bezplatný softvér, ktorý používa {host}. Prosím, prispejte, aby sme ho mohli ďalej rozvíjať!"
 color: "Farba"
+_role:
+  priority: "Priorita"
+  _priority:
+    low: "Málo"
+    middle: "Stredné"
+    high: "Vysoká"
 _sensitiveMediaDetection:
   description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera."
   sensitivity: "Citlivosť detekcie"
@@ -950,6 +938,7 @@ _accountDelete:
 _ad:
   back: "Späť"
   reduceFrequencyOfThisAd: "Túto reklamu zobrazovať menej"
+  hide: "Nikdy nezobrazovať"
 _forgotPassword:
   enterEmail: "Zadajte emailovú adresu, ktorú ste použili pri registrácii. Pošleme vám na ňu odkaz, cez ktorý si môžete obnoviť heslo."
   ifNoEmail: "Ak ste pri registrácii nepoužili email, prosím kontaktujte administrátora."
@@ -1005,72 +994,6 @@ _nsfw:
   respect: "Skryť NSFW médiá"
   ignore: "Neskrývať NSFW médiá"
   force: "Skryť všetky médiá"
-_mfm:
-  cheatSheet: "MFM Cheatsheet"
-  intro: "MFM je Misskey exkluzívny značkovací jazyk, ktorý sa dá používať na viacerých miestach. Tu môžete vidieť zoznam všetkej dostupnej MFM syntaxe."
-  dummy: "Misskey rozširuje svet Fediverza"
-  mention: "Zmienka"
-  mentionDescription: "Používateľa spomeniete použítím zavináča a mena používateľa"
-  hashtag: "Hashtag"
-  hashtagDescription: "Môžete zadať hashtag použitím mriežky a textu"
-  url: "URL"
-  urlDescription: "URL sa dajú zobraziť."
-  link: "Odkaz"
-  linkDescription: "Jednotlivé časti texty sa dajú zobraziť ako URL."
-  bold: "Tučné"
-  boldDescription: "Zvýrazní písmená tým, že budú tučnejšie."
-  small: "Malé"
-  smallDescription: "Zobrazí obsah malý a tenký."
-  center: "Vystrediť prvky"
-  centerDescription: "Zobrazí obsah v strede"
-  inlineCode: "Kód (inline)"
-  inlineCodeDescription: "Zobrazí kód so zvýraznením syntaxe."
-  blockCode: "Kód (blok)"
-  blockCodeDescription: "Zobrazí viacriadkový kód so zvýraznením syntaxe v bloku."
-  inlineMath: "Vzorec (inline)"
-  inlineMathDescription: "Zobrazí matematický vzorec (KaTeX) v riadku."
-  blockMath: "Vzorec (blok)"
-  blockMathDescription: "Zobrazí viacriadkový matematický vzorec (KaTeX) v bloku"
-  quote: "Citovať"
-  quoteDescription: "Zobrazí obsah ako citát."
-  emoji: "Vlastné emoji"
-  emojiDescription: "Pridaním dvojbodiek pred a za názov vlastnej emoji, sa dá zobraziť vlastná emoji."
-  search: "Hľadať"
-  searchDescription: "Zobrazí vyhľadávacie pole so zadaným textom."
-  flip: "Preklopiť"
-  flipDescription: "Preklopí obsah horizontálne alebo vertikálne"
-  jelly: "Animácia (želé)"
-  jellyDescription: "Obsah sa bude hýbať ako želé."
-  tada: "Animácia (tadá)"
-  tadaDescription: "Obsah sa bude hýbať ako Tada!"
-  jump: "Animácia (skok)"
-  jumpDescription: "Obsah skočí."
-  bounce: "Animácia (odraz)"
-  bounceDescription: "Obsah sa bude odrážať."
-  shake: "Animácia (trasenie)"
-  shakeDescription: "Obsah sa bude triasť."
-  twitch: "Animácia (myknutie)"
-  twitchDescription: "Obsahu dá animáciu silného trasenia."
-  spin: "Animácia (rotácia)"
-  spinDescription: "Obsahu pridá otáčajúcu animáciu."
-  x2: "Veľký"
-  x2Description: "Zobrazí obsah väčší."
-  x3: "Veľmi veľký"
-  x3Description: "Zobrazí obsah ešte väčší."
-  x4: "Neuveriteľne veľký"
-  x4Description: "Zobrazí obsah ešte viac veľký než veľmi veľký."
-  blur: "Rozmazanie"
-  blurDescription: "Týmto efektom môže byť obsah rozmazaný. Zaostrí sa keď ned neho príde kurzor."
-  font: "Písmo"
-  fontDescription: "Nastaví písmo, ktorým sa zobrazí text."
-  rainbow: "Dúha"
-  rainbowDescription: "Zobrazí obsah vo farbách dúhy."
-  sparkle: "Trblietky"
-  sparkleDescription: "Obsahu dodá trblietajúci efekt."
-  rotate: "Otáčať"
-  rotateDescription: "Otočí obsah o určitý uhol."
-  plain: "Obyčajné"
-  plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
   none: "Nikdy nezobrazovať"
   remote: "Zobraziť pre vzdialených používateľov"
@@ -1233,14 +1156,14 @@ _tutorial:
   step8_3: "Nastavenia notifikácií môžete neskôr zmeniť."
 _2fa:
   alreadyRegistered: "Už ste zaregistrovali 2-faktorové autentifikačné zariadenie."
-  registerDevice: "Registrovať nové zariadenie"
-  registerKey: "Registrovať bezpečnostný kľúč"
   step1: "Najprv si nainštalujte autentifikačnú aplikáciu (napríklad {a} alebo {b}) na svoje zariadenie."
   step2: "Potom, naskenujte QR kód zobrazený na obrazovke."
   step2Url: "Do aplikácie zadajte nasledujúcu URL adresu:"
   step3: "Nastavenie dokončíte zadaním tokenu z vašej aplikácie."
   step4: "Od teraz, všetky ďalšie prihlásenia budú vyžadovať prihlasovací token."
   securityKeyInfo: "Okrem odtlačku prsta alebo PIN autentifikácie si môžete nastaviť autentifikáciu cez hardvérový bezpečnostný kľúč podporujúci FIDO2 a tak ešte viac zabezpečiť svoj účet."
+  removeKeyConfirm: "Naozaj chcete odstrániť \"{name}\"?"
+  renewTOTPCancel: "Nie, ďakujem"
 _permissions:
   "read:account": "Vidieť informácie o vašom účte"
   "write:account": "Upraviť informácie o vašom účte"
@@ -1286,7 +1209,6 @@ _antennaSources:
   homeTimeline: "Poznámky od sledovaného používateľa"
   users: "Poznámky od konkrétneho používateľa"
   userList: "Poznámky od používateľov v zozname"
-  userGroup: "Poznámky od používateľov z konkrétnej skupiny."
 _weekday:
   sunday: "Nedeľa"
   monday: "Pondelok"
@@ -1358,8 +1280,6 @@ _visibility:
   followersDescription: "Viditeľné iba tým, ktorí vás sledujú"
   specified: "Priame"
   specifiedDescription: "Viditeľné iba pre konkrétnych používateľov"
-  localOnly: "Iba lokálne"
-  localOnlyDescription: "Vzdialený používatelia nebudú vidieť"
 _postForm:
   replyPlaceholder: "Odpoveď na túto poznámku..."
   quotePlaceholder: "Citovanie tejto poznámky..."
@@ -1487,12 +1407,9 @@ _notification:
   youGotReply: "{name} vám odpovedal/a"
   youGotQuote: "{name} vás citoval/a"
   youRenoted: "{name} preposlal/a vašu poznámku"
-  youGotMessagingMessageFromUser: "{name} vám poslal/a správu"
-  youGotMessagingMessageFromGroup: "Prišla správa do skupiny {name}"
   youWereFollowed: "Máte nového sledujúceho"
   youReceivedFollowRequest: "Dostali ste žiadosť o sledovanie"
   yourFollowRequestAccepted: "Vaša žiadosť o sledovanie bola prijatá"
-  youWereInvitedToGroup: "Pozvať do skupiny"
   pollEnded: "Výsledky hlasovania sú k dispozícii."
   unreadAntennaNote: "Anténa {name}"
   emptyPushNotificationMessage: "Push notifikácie aktualizované"
@@ -1507,7 +1424,6 @@ _notification:
     pollEnded: "Hlasovanie skončilo"
     receiveFollowRequest: "Doručené žiadosti o sledovanie"
     followRequestAccepted: "Schválené žiadosti o sledovanie"
-    groupInvited: "Pozvánky do skupín"
     app: "Oznámenia z prepojených aplikácií"
   _actions:
     followBack: "Sledovať späť\n"
@@ -1537,5 +1453,6 @@ _deck:
     tl: "Časová os"
     antenna: "Antény"
     list: "Zoznam"
+    channel: "Kanály"
     mentions: "Zmienky"
     direct: "Priame poznámky"

locales/sv-SE.yml

@@ -110,6 +110,7 @@ clickToShow: "Klicka för att visa"
 sensitive: "Känsligt innehåll"
 add: "Lägg till"
 reaction: "Reaktioner"
+reactions: "Reaktioner"
 reactionSetting: "Reaktioner som ska visas i reaktionsväljaren"
 reactionSettingDescription2: "Dra för att omordna, klicka för att radera, tryck \"+\" för att lägga till."
 rememberNoteVisibility: "Komihåg notvisningsinställningar"
@@ -370,11 +371,6 @@ pushNotificationNotSupported: "Din webbläsare eller instans har inte stöd för
 _email:
   _follow:
     title: "följde dig"
-_mfm:
-  mention: "Nämn"
-  quote: "Citat"
-  emoji: "Anpassa emoji"
-  search: "Sök"
 _channel:
   setBanner: "Välj banner"
   removeBanner: "Ta bort banner"
@@ -387,12 +383,13 @@ _sfx:
   notification: "Notifikationer"
   chat: "Chatt"
   antenna: "Antenner"
+_2fa:
+  renewTOTPCancel: "Nej tack"
 _antennaSources:
   all: "Alla noter"
   homeTimeline: "Noter från följda användare"
   users: "Noter från specifika användare"
   userList: "Noter från en specificerad lista av användare"
-  userGroup: "Noter från användare i en specificerad grupp"
 _widgets:
   profile: "Profil"
   instanceInfo: "Instansinformation"

locales/th-TH.yml

@@ -103,6 +103,8 @@ renoted: "รีโน้ตเอาไว้"
 cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตไว้ใหม่ได้นะ"
 cantReRenote: "ไม่สามารถรีโน้ตเอาไว้ใหม่ได้นะ"
 quote: "อ้างคำพูด"
+inChannelRenote: "รีโน้ตช่องแชลแนลเท่านั้น"
+inChannelQuote: "อ้างช่องเท่านั้น"
 pinnedNote: "โน้ตที่ปักหมุดเอาไว้"
 pinned: "ปักหมุดไปยังโปรไฟล์"
 you: "ตัวเอง"
@@ -110,6 +112,7 @@ clickToShow: "คลิกเพื่อแสดง"
 sensitive: "เนื้อหาที่ละเอียดอ่อน NSFW"
 add: "เพิ่ม"
 reaction: "รีแอคชั่น"
+reactions: "รีแอคชั่น"
 reactionSetting: "รีแอคชั่นไปยังแสดงผลในตัวเลือกการรีแอคชั่น"
 reactionSettingDescription2: "กดลากเพื่อจัดลำดับใหม่ กดคลิกเพื่อลบ กด \"+\" เพื่อเพิ่ม"
 rememberNoteVisibility: "จดจำการตั้งค่าการมองเห็นตัวโน้ต"
@@ -128,6 +131,7 @@ unblockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต
 suspendConfirm: "นายแน่ใจแล้วเหรอว่าต้องการระงับบัญชีนี้อ่ะ?"
 unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
 selectList: "เลือกรายการ"
+selectChannel: "เลือกแชนแนล"
 selectAntenna: "เลือกเสาอากาศ"
 selectWidget: "เลือกวิดเจ็ต"
 editWidgets: "แก้ไขวิดเจ็ต"
@@ -255,6 +259,8 @@ noMoreHistory: "ในนั้นไม่มีประวัติอีก
 startMessaging: "เริ่มการสนทนา"
 nUsersRead: "อ่านโดย {n}"
 agreeTo: "ฉันยอมรับที่จะ {0}"
+agreeBelow: "ฉันยอมรับถึงด้านล่าง"
+basicNotesBeforeCreateAccount: "หมายเหตุสำคัญ"
 tos: "ข้อกำหนดและเงื่อนไข"
 start: "เริ่มต้น​ใช้งาน​"
 home: "หน้าแรก"
@@ -387,13 +393,10 @@ about: "เกี่ยวกับ"
 aboutMisskey: "เกี่ยวกับ Misskey"
 administrator: "ผู้ดูแลระบบ"
 token: "โทเค็น"
-twoStepAuthentication: "ยืนยันตัวตน 2 ชั้น"
 moderator: "ผู้ควบคุม"
 moderation: "การกลั่นกรอง"
 nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} รายนี้"
 securityKey: "กุญแจความปลอดภัย"
-securityKeyName: "ชื่อคีย์"
-registerSecurityKey: "ลงทะเบียนรหัสความปลอดภัยคีย์"
 lastUsed: "ใช้ล่าสุด"
 unregister: "เลิกติดตาม"
 passwordLessLogin: "เข้าสู่ระบบแบบไม่ใช้รหัสผ่าน"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "ทำเครื่องหมายข้อค
 help: "ช่วยเหลือ"
 inputMessageHere: "พิมพ์ข้อความที่นี่"
 close: "ปิด"
-group: "กลุ่ม"
-groups: "กลุ่ม"
-createGroup: "สร้างกลุ่ม"
-ownedGroups: "กลุ่มที่เป็นเจ้าของ"
-joinedGroups: "เข้าร่วมกลุ่ม"
 invites: "เชิญชวน"
-groupName: "ชื่อกลุ่ม"
 members: "สมาชิก"
 transfer: "ถ่ายโอน"
-messagingWithUser: "แชทส่วนตัว"
-messagingWithGroup: "แชทกลุ่ม"
 title: "หัวข้อ"
 text: "ข้อความ"
 enable: "เปิดใช้งาน"
 next: "ถัด​ไป"
 retype: "พิมพ์รหัสอีกครั้ง"
 noteOf: "โน้ต โดย {ผู้ใช้งาน}"
-inviteToGroup: "ชวนเข้ากลุ่ม"
 quoteAttached: "อ้างอิง"
 quoteQuestion: "นายต้องการที่จะอ้างอิงหรอ?"
 noMessagesYet: "ยังไม่มีข้อความนะ"
@@ -450,20 +444,17 @@ passwordMatched: "ถูกต้อง!"
 passwordNotMatched: "ไม่ถูกต้อง"
 signinWith: "ลงชื่อเข้าใช้ด้วย {x}"
 signinFailed: "ไม่สามารถลงชื่อผู้เข้าใช้ได้ เนื่องจาก ชื่อผู้ใช้หรือรหัสผ่านที่คุณป้อนนั้นไม่ถูกต้องนะ"
-tapSecurityKey: "แตะคีย์ความปลอดภัย"
 or: "หรือ"
 language: "ภาษา"
 uiLanguage: "ภาษาอินเทอร์เฟซผู้ใช้งาน"
-groupInvited: "คุณได้รับเชิญให้เข้าร่วมกลุ่ม"
 aboutX: "เกี่ยวกับ {x}"
 emojiStyle: "สไตล์อิโมจิ"
 native: "ภาษาแม่"
 disableDrawer: "อย่าใช้ลิ้นชักสไตล์เมนู"
-youHaveNoGroups: "คุณยังไม่มีกลุ่ม"
-joinOrCreateGroup: "รับเชิญเข้าร่วมกลุ่มหรือสร้างกลุ่มของคุณเองเลยนะ"
 noHistory: "ไม่มีรายการ"
 signinHistory: "ประวัติการเข้าสู่ระบบ"
-disableAnimatedMfm: "ปิดการใช้งาน MFM ด้วยแอนิเมชั่น"
+enableAdvancedMfm: "เปิดใช้งาน MFM ขั้นสูง"
+enableAnimatedMfm: "เปิดการใช้งาน MFM ด้วยแอนิเมชั่น"
 doing: "กำลังประมวลผล......"
 category: "หมวดหมู่"
 tags: "แท็ก"
@@ -833,8 +824,6 @@ deleteAccountConfirm: "การดำเนินการนี้จะลบ
 incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
 voteConfirm: "ยืนยันการโหวต \"{choice}\" มั้ย?"
 hide: "ซ่อน"
-leaveGroup: "ออกจากกลุ่ม"
-leaveGroupConfirm: "คุณแน่ใจหรอว่าต้องการออกจาก \"{name}\""
 useDrawerReactionPickerForMobile: "แสดงผล ตัวเลือกปฏิกิริยาเป็นลิ้นชักบนมือถือ"
 welcomeBackWithName: "ยินดีต้อนรับการกลับมานะค่ะ, {name}"
 clickToFinishEmailVerification: "กรุณาคลิก [{ok}] เพื่อดำเนินการยืนยันอีเมลให้เสร็จสมบูรณ์นะ"
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "ไม่สามารถเรียกด
 rateLimitExceeded: "เกินขีดจำกัดอัตรา"
 cropImage: "ครอบตัดรูปภาพ"
 cropImageAsk: "คุณต้องการครอบตัดรูปภาพนี้อย่างงั้นหรือ?"
+cropYes: "ครอบตัด"
+cropNo: "ใช้ตามที่เป็นอยู่"
 file: "ไฟล์"
 recentNHours: "ล่าสุด {n} ชั่วโมงที่แล้ว"
 recentNDays: "ล่าสุด {n} วันที่แล้ว"
@@ -926,29 +917,324 @@ didYouLikeMisskey: "คุณเคยชอบ Misskey ไหม?"
 pleaseDonate: "{host} ใช้ซอฟต์แวร์ฟรี Misskey เราขอขอบคุณการบริจาคของคุณอย่างสูงเพื่อให้การพัฒนา Misskey สามารถดำเนินต่อไปได้นะ!"
 roles: "บทบาท"
 role: "บทบาท"
+normalUser: "ผู้ใช้มาตรฐาน"
 undefined: "ไม่ได้กำหนด"
 assign: "กำหนด"
 unassign: "ยังไม่มอบหมาย"
 color: "สี"
+manageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
+youCannotCreateAnymore: "คุณถึงขีดจํากัดการสร้างแล้วนะ"
+cannotPerformTemporary: "ไม่สามารถใช้การได้ชั่วคราว"
+cannotPerformTemporaryDescription: "การดําเนินการนี้ไม่สามารถดําเนินการได้ชั่วคราว เนื่องจากเกินขีดจํากัดการดําเนินการ กรุณารอสักครู่แล้วลองใหม่อีกครั้งนะค่ะ"
+preset: "พรีเซ็ต"
+selectFromPresets: "เลือกจากการพรีเซ็ต"
+achievements: "ความสำเร็จ"
+gotInvalidResponseError: "การตอบสนองเซิร์ฟเวอร์ไม่ถูกต้อง"
+gotInvalidResponseErrorDescription: "เซิร์ฟเวอร์อาจไม่สามารถเข้าถึงได้หรืออาจจะกำลังอยู่ในระหว่างปรับปรุง กรุณาลองใหม่อีกครั้งในภายหลังนะคะ"
+thisPostMayBeAnnoying: "โน้ตนี้อาจจะเป็นการรบกวนผู้อื่นนะคะ"
+thisPostMayBeAnnoyingHome: "โพสต์ไปยังบ้านไทม์ไลน์"
+thisPostMayBeAnnoyingCancel: "เลิก"
+thisPostMayBeAnnoyingIgnore: "โพสต์ยังไงก็แล้วแต่"
+collapseRenotes: "ยุบ renotes ที่คุณได้เห็นแล้ว"
+internalServerError: "เซิร์ฟเวอร์ภายในเกิดข้อผิดพลาด"
+internalServerErrorDescription: "เซิร์ฟเวอร์รันค้นพบข้อผิดพลาดที่ไม่คาดคิด"
+copyErrorInfo: "คัดลอกรายละเอียดข้อผิดพลาด"
+_achievements:
+  earnedAt: "ได้รับเมื่อ"
+  _types:
+    _notes1:
+      title: "เพียงแค่ตั้งค่า msky ของฉัน"
+      description: "โพสต์โน้ตครั้งแรกของคุณ"
+      flavor: "ขอให้มีช่วงเวลาที่ดีกับ Misskey นะคะ!"
+    _notes10:
+      title: "โน้ตบางอย่าง"
+      description: "โพสต์ 10 โน้ต"
+    _notes100:
+      title: "โน้ตจำนวนมาก"
+      description: "โพสต์ 100 โน้ต"
+    _notes500:
+      title: "ครอบคลุมในโน้ต"
+      description: "โพสต์ 500 โน้ต"
+    _notes1000:
+      title: "ภูเขาแห่งโน้ต"
+      description: "โพสต์ 1,000 โน้ต"
+    _notes5000:
+      title: "โน้ตล้น"
+      description: "โพสต์ 5,000 โน้ต"
+    _notes10000:
+      title: "ซุปเปอร์โน้ต"
+      description: "โพสต์ 10,000 โน้ต"
+    _notes20000:
+      title: "ต้องการ... เพิ่มเติม... โน้ต..."
+      description: "โพสต์ 20,000 โน้ต"
+    _notes30000:
+      title: "โน้ต โน้ต โน้ต!"
+      description: "โพสต์ 30,000 โน้ต"
+    _notes40000:
+      title: "โน้ตโรงงาน"
+      description: "โพสต์ 40,000 โน้ต"
+    _notes50000:
+      title: "ดาวเคราะห์แห่งโน้ต"
+      description: "โพสต์ 50,000 โน้ต"
+    _notes60000:
+      title: "โน้ตควอซาร์"
+      description: "โพสต์ 60,000 โน้ต"
+    _notes70000:
+      title: "โน้ตหลุมดำ"
+      description: "โพสต์ 70,000 โน้ต"
+    _notes80000:
+      title: "โน้ต กาแล็กซี่"
+      description: "โพสต์ 80,000 โน้ต"
+    _notes90000:
+      title: "โน้ต จักรวาล"
+      description: "โพสต์ 90,000 โน้ต"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "โพสต์ 100,000 โน้ต"
+      flavor: "นายแน่ใจล่ะก็ มีอะไรพูดมาได้นะ"
+    _login3:
+      title: "มือใหม่ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 3 วัน"
+      flavor: "เริ่มตั้งแต่วันนี้ เรียกฉันว่ามิสคิสต์"
+    _login7:
+      title: "มือใหม่ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 7 วัน"
+      flavor: "รู้สึกเหมือนคุณได้แขวนของสิ่งต่างๆ หรือยังคะ?"
+    _login15:
+      title: "มือใหม่ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 15 วัน"
+    _login30:
+      title: "มิสคิสท์ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 30 วัน"
+    _login60:
+      title: "มิสคิสท์ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 60 วัน"
+    _login100:
+      title: "มิสคิสท์ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 100 วัน"
+      flavor: "ความรุนแรง Misskist"
+    _login200:
+      title: "ลูกค้าประจำ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 200 วัน"
+    _login300:
+      title: "ลูกค้าประจำ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 300 วัน"
+    _login400:
+      title: "ลูกค้าประจำ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 400 วัน"
+    _login500:
+      title: "ผู้เชี่ยวชาญ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 500 วัน"
+      flavor: "เพื่อนของผมนะมักจะกล่าวว่าผมนะชอบจดโน้ต"
+    _login600:
+      title: "ผู้เชี่ยวชาญ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 600 วัน"
+    _login700:
+      title: "ผู้เชี่ยวชาญ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 700 วัน"
+    _login800:
+      title: "ปรมาจารย์ด้านโน้ต I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 800 วัน"
+    _login900:
+      title: "ปรมาจารย์ด้านโน้ต II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 900 วัน"
+    _login1000:
+      title: "ปรมาจารย์ด้านโน้ต III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 1,000 วัน"
+      flavor: "ขอบคุณที่ใช้ Misskey นะ !"
+    _noteClipped1:
+      title: "จะต้อง... คลิป..."
+      description: "คลิปโน้ตตัวแรกของคุณ"
+    _noteFavorited1:
+      title: "สตาร์เกเซอร์"
+      description: "ชื่นชอบโน้ตแรกของคุณ"
+    _myNoteFavorited1:
+      title: "แสวงหาดวงดาว"
+      description: "มีคนอื่นๆที่ชื่นชอบหนึ่งในโน้ตของคุณ"
+    _profileFilled:
+      title: "เตรียมไว้อย่างดี"
+      description: "ตั้งค่าโปรไฟล์ของคุณ"
+    _markedAsCat:
+      title: "ฉันเป็นแมว"
+      description: "ทำเครื่องหมายบัญชีของคุณว่าเป็นแมว"
+      flavor: "ฉันจะให้ชื่อคุณภายหลังนะ"
+    _following1:
+      title: "กำลังติดตามผู้ใช้คนแรกของคุณ"
+      description: "ติดตามผู้ใช้"
+    _following10:
+      title: "ทำต่อไป... ทำต่อไป..."
+      description: "ติดตาม 10 บัญชีผู้ใช้"
+    _following50:
+      title: "มีเพื่อนมากมาย"
+      description: "ติดตาม 50 บัญชี"
+    _following100:
+      title: "เพื่อน 100 คน"
+      description: "ติดตาม 100 บัญชี"
+    _following300:
+      title: "เพื่อนโอเวอร์โหลด"
+      description: "ติดตาม 300 บัญชี"
+    _followers1:
+      title: "ผู้ติดตามคนแรก"
+      description: "ได้รับ 1 ผู้ติดตาม"
+    _followers10:
+      title: "ติดตามฉัน!"
+      description: "ได้รับ 10 คนผู้ติดตาม"
+    _followers50:
+      title: "มากันเป็นฝูง"
+      description: "ได้รับ 50 ผู้ติดตาม"
+    _followers100:
+      title: "บุคคลที่เป็นที่นิยม"
+      description: "ได้รับ 100 ผู้ติดตาม"
+    _followers300:
+      title: "กรุณาสร้างบรรทัดเดียวนะคะ"
+      description: "ได้รับ 300 คนผู้ติดตาม"
+    _followers500:
+      title: "เสาสัญญาณ"
+      description: "ได้รับ 500 คนผู้ติดตาม"
+    _followers1000:
+      title: "ผู้ทรงอิทธิพล"
+      description: "ได้รับ 1,000 ผู้ติดตาม"
+    _collectAchievements30:
+      title: "นักสะสมความสำเร็จ"
+      description: "ได้รับความสำเร็จ 30 ครั้ง"
+    _viewAchievements3min:
+      title: "ชอบบรรลุผลสําเร็จ"
+      description: "มองดูรายการความสำเร็จของคุณเป็นเวลาอย่างน้อย 3 นาที"
+    _iLoveMisskey:
+      title: "ฉันรัก Misskey"
+      description: "โพสต์ \"I ❤ #Misskey\""
+      flavor: "ทีมผู้พัฒนา Misskey ได้ขอบคุณสำหรับการสนับสนุนของคุณ!"
+    _foundTreasure:
+      title: "ล่าสมบัติ"
+      description: "คุณพบสมบัติที่ซ่อนอยู่"
+    _client30min:
+      title: "พักผ่อนสักหน่อย"
+      description: "ใช้เวลา 30 นาทีบน Misskey"
+    _noteDeletedWithin1min:
+      title: "ไม่เป็นไร"
+      description: "ลบโน้ตภายในหนึ่งนาทีหลังจากที่โพสต์"
+    _postedAtLateNight:
+      title: "กลางคืน"
+      description: "โพสต์โน้ตตอนดึกๆ"
+      flavor: "ได้เวลาเข้านอนแล้วนะ"
+    _postedAt0min0sec:
+      title: "นาฬิกาพูดได้"
+      description: "โพสต์บนโน้ตเมื่อเวลา 00:00 น."
+      flavor: "คลิก คลิก คลิก แกล๊งๆ"
+    _selfQuote:
+      title: "อ้างอิงตนเอง"
+      description: "อ้างโน้ตย่อของคุณเอง"
+    _htl20npm:
+      title: "ไทม์ไลน์ไหล"
+      description: "มีการทำความเร็วของไทม์ไลน์ที่บ้านของคุณเกิน 20 npm (โน้ตต่อนาที)"
+    _viewInstanceChart:
+      title: "วิเคราะห์"
+      description: "ดูแผนภูมิอินสแตนซ์ของคุณ"
+    _outputHelloWorldOnScratchpad:
+      title: "หวัดดีชาวโลก!"
+      description: "เอาพุต \"hello world\" ใน Scratchpad"
+    _open3windows:
+      title: "มัลติวินโดว์"
+      description: "มีการเปิดหน้าต่างอย่างน้อย 3 หน้าต่างพร้อมกัน"
+    _driveFolderCircularReference:
+      title: "อ้างอิงวงจร"
+      description: "พยายามสร้างโฟลเดอร์ที่ซ้อนกันแบบวนซ้ำในไดรฟ์"
+    _reactWithoutRead:
+      title: "คุณอ่านมันจริงๆหรือเปล่า?"
+      description: "มีการโต้ตอบกับโน้ตที่มีความยาวมากกว่า 100 ตัวอักษรภายใน 3 วินาทีหลังจากที่โพสต์"
+    _clickedClickHere:
+      title: "คลิ๊กที่นี่"
+      description: "คุณได้คลิกที่นี่"
+    _justPlainLucky:
+      title: "แค่ลัคกี้ธรรมดา"
+      description: "มีโอกาสที่จะได้รับด้วยความน่าจะเป็นไปได้ 0.005% ทุก ๆ 10 วินาที"
+    _setNameToSyuilo:
+      title: "พระเจ้าคอมเพล็กซ์"
+      description: "ตั้งชื่อของคุณเป็น \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "ครบรอบหนึ่งปี"
+      description: "ผ่านไปหนึ่งปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
+    _passedSinceAccountCreated2:
+      title: "ครบรอบสองปี"
+      description: "ผ่านไปสองปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
+    _passedSinceAccountCreated3:
+      title: "ครบรอบสามปี"
+      description: "ผ่านไปสามปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
+    _loggedInOnBirthday:
+      title: "สุขสันต์วันเกิด"
+      description: "เข้าสู่ระบบในวันเกิดของคุณ"
+    _loggedInOnNewYearsDay:
+      title: "สวัสดีปีใหม่!"
+      description: "เข้าสู่ระบบในวันแรกของปี"
+      flavor: "อีกปีที่ยอดเยี่ยมในโอกาสนี้เลย"
+    _cookieClicked:
+      title: "เกมที่คุณคลิกที่คุกกี้"
+      description: "คลิกคุกกี้"
+      flavor: "เดี๋ยวก่อนนะ คุณอยู่ในเว็บไซต์ที่ถูกต้องแน่อย่างงั้นเหรอ?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "โพสต์ลิงก์ไปยัง Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
   name: "ชื่อบทบาท"
   description: "คำอธิบายบทบาท"
+  permission: "สิทธิ์ตามบทบาท"
+  descriptionOfPermission: "<b>ผู้ดูแลกลั่นกรองเนื้อหา</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้นะ\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของอินสแตนซ์ได้นะ"
+  assignTarget: "มอบหมาย"
+  descriptionOfAssignTarget: "<b>แมนนวล</b> เพื่อเปลี่ยนผู้ที่เป็นส่วนหนึ่งของบทบาทนี้และใครที่ไม่ใช่ด้วยตนเอง\n<b>เงื่อนไข</b> เพื่อให้ผู้ใช้ได้รับการกำหนดและนำออกจากบทบาทนี้โดยอัตโนมัติตามเงื่อนไขชุดหนึ่ง"
+  manual: "ปรับเอง"
+  conditional: "มีเงื่อนไข"
+  condition: "เงื่อนไข"
+  isConditionalRole: "นี่คือบทบาทที่มีเงื่อนไข"
   isPublic: "บทบาทสาธารณะ"
   descriptionOfIsPublic: "ทุกคนสามารถดูได้ว่าผู้ใช้งานนั้นได้รับมอบหมายบทบาทด้วยหรือไม่ \n\nบทบาทจะแสดงในโปรไฟล์ของผู้ใช้ด้วย"
   options: "ตัวเลือกบทบาท"
+  policies: "นโยบาย"
   baseRole: "บทบาทพื้นฐาน"
   useBaseValue: "ใช้บทบาทพื้นฐานเริ่มต้น"
   chooseRoleToAssign: "เลือกบทบาทที่ต้องการกำหนด"
+  iconUrl: "ไอคอน URL"
+  asBadge: "แสดงเป็นตรา"
+  descriptionOfAsBadge: "ไอคอนของบทบาทนี้จะปรากฏถัดจากชื่อผู้ใช้ของผู้ใช้งานด้วยบทบาทนี้ถ้าหากเปิดใช้งาน"
   canEditMembersByModerator: "อนุญาตให้ผู้ดูแลแก้ไขสมาชิก"
   descriptionOfCanEditMembersByModerator: "เมื่อเปิดใช้ ผู้ดูแลนอกเหนือจากผู้ดูแลระบบแล้ว จะสามารถกำหนดและยกเลิกการมอบหมายบทบาทนี้ให้กับผู้ใช้ได้ เมื่อปิด เฉพาะผู้ดูแลระบบเท่านั้นที่จะสามารถกำหนดผู้ใช้ได้นะ"
+  priority: "ลำดับความสำคัญ"
+  _priority:
+    low: "ต่ำ"
+    middle: "ปานกลาง"
+    high: "สูง"
   _options:
     gtlAvailable: "การดูไทม์ไลน์ทั่วโลก"
     ltlAvailable: "การดูไทม์ไลน์ในท้องถิ่น"
     canPublicNote: "สามารถส่งโน้ตสาธารณะ"
+    canInvite: "สร้างรหัสเชิญอินสแตนซ์"
+    canManageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
     driveCapacity: "ความจุของไดรฟ์"
+    pinMax: "จํานวนสูงสุดของโน้ตที่ปักหมุดไว้"
     antennaMax: "จำนวนสูงสุดของเสาอากาศ"
+    wordMuteMax: "จำนวนอักขระสูงสุดที่อนุญาตในการปิดเสียงคำ"
+    webhookMax: "จำนวนเว็บฮุคสูงสุด"
+    clipMax: "จำนวนคลิปสูงสุด"
+    noteEachClipsMax: "จำนวนโน้ตสูงสุดภายในคลิป"
+    userListMax: "จำนวนรายชื่อผู้ใช้สูงสุด"
+    userEachUserListsMax: "จำนวนผู้ใช้สูงสุดภายในรายการผู้ใช้"
+    rateLimitFactor: "ขีดจำกัดอัตรา"
+    descriptionOfRateLimitFactor: "ขีดจํากัดอัตราที่ต่ำกว่ามีข้อจํากัดน้อยกว่าข้อจํากัดที่สูงกว่า"
+    canHideAds: "ซ่อนโฆษณา"
+  _condition:
+    isLocal: "ผู้ใช้ภายใน"
+    isRemote: "ผู้ใช้ระยะไกล"
+    createdLessThan: "สร้างน้อยกว่า"
+    createdMoreThan: "สร้างมากกว่า"
+    followersLessThanOrEq: "จำนวนผู้ติดตามน้อยกว่าหรือเท่ากับ\n"
+    followersMoreThanOrEq: "จำนวนผู้ติดตามมากกว่าหรือเท่ากับ\n"
+    followingLessThanOrEq: "จำนวนบัญชีต่อไปนี้คือ น้อยกว่าหรือเท่ากับ"
+    followingMoreThanOrEq: "จำนวนบัญชีต่อไปนี้คือ มากกว่าหรือเท่ากับ"
+    and: "และ"
+    or: "หรือ"
+    not: "ไม่"
 _sensitiveMediaDetection:
   description: "ลดความพยายามในการดูแลเซิร์ฟเวอร์ผ่านการจดจำสื่อ NSFW โดยอัตโนมัติผ่านการเรียนรู้ของเครื่อง การทำสิ่งนี้อาจจะเพิ่มภาระบนเซิร์ฟเวอร์เล็กน้อย"
   sensitivity: "การตรวจจับความไว"
@@ -981,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "ย้อนกลับ"
   reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
+  hide: "ไม่ต้องแสดง"
 _forgotPassword:
   enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
   ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
@@ -1036,72 +1323,6 @@ _nsfw:
   respect: "ซ่อนสื่อ NSFW"
   ignore: "อย่าซ่อนสื่อ NSFW"
   force: "ซ่อนสื่อทั้งหมด"
-_mfm:
-  cheatSheet: "โค้ด MFM Cheat Sheet"
-  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Misskey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
-  dummy: "Misskey ขยายโลกของ Fediverse"
-  mention: "กล่าวถึง"
-  mentionDescription: "คุณสามารถระบุผู้ใช้โดยใช้ At-Symbol และชื่อผู้ใช้ได้นะ"
-  hashtag: "แฮชแท็ก"
-  hashtagDescription: "คุณสามารถระบุชื่อแฮชแท็กได้โดยใช้เครื่องหมายตัวเลขและข้อความได้นะ"
-  url: "URL"
-  urlDescription: "สามารถแสดง URL ได้นะ"
-  link: "ลิงก์"
-  linkDescription: "เจาะจงเฉพาะ ส่วนของข้อความที่สามารถแสดงเป็น URL ได้"
-  bold: "ตัวหนา"
-  boldDescription: "ไฮไลท์ตัวอักษรโดยทำให้หนาขึ้น"
-  small: "ขนาดเล็ก"
-  smallDescription: "แสดงผลเนื้อหาขนาดเล็กและบาง"
-  center: "เซ็นเตอร์"
-  centerDescription: "แสดงผลเนื้อหาเป็นศูนย์กลาง"
-  inlineCode: "โค้ด (อินไลน์)"
-  inlineCodeDescription: "แสดงผลการเน้นไวยากรณ์แบบอินไลน์สำหรับโค้ด (โปรแกรม)"
-  blockCode: "โค้ด (บล็อก)"
-  blockCodeDescription: "แสดงผลการเน้นไวยากรณ์สำหรับโค้ดหลายบรรทัด (โปรแกรม) ในบล็อก"
-  inlineMath: "คณิต (อินไลน์)"
-  inlineMathDescription: "แสดงผลสูตรคณิต (KaTeX) ในบรรทัด"
-  blockMath: "คณิต (บล็อก)"
-  blockMathDescription: "แสดงผลสูตรคณิตหลายบรรทัด (KaTeX) ในบล็อก"
-  quote: "อ้างคำพูด"
-  quoteDescription: "แสดงผลเนื้อหาเป็นใบเสนอราคา"
-  emoji: "กำหนดอีโมจิเอง"
-  emojiDescription: "โดยล้อมรอบชื่ออีโมจิที่กำหนดเองด้วยเครื่องหมายทวิภาค จะสามารถแสดงผลอีโมจิที่กำหนดเองได้"
-  search: "ค้นหา"
-  searchDescription: "แสดงผลกล่องค้นหาพร้อมกับข้อความที่ป้อนไว้ล่วงหน้า"
-  flip: "พลิก"
-  flipDescription: "พลิกเนื้อหาในแนวนอนหรือแนวตั้ง"
-  jelly: "แอนิเมชั่น (เยลลี่)"
-  jellyDescription: "ให้เนื้อหาเป็นแอนิเมชั่นเหมือนเยลลี่"
-  tada: "แอนิเมชั่น (ธาดา)"
-  tadaDescription: "ให้เนื้อหาเป็นแอนิเมชั่นเหมือน \"ทาด้า!\""
-  jump: "อนิเมชั่น (กระโดด)"
-  jumpDescription: "ให้เนื้อหามีภาพเคลื่อนไหวแบบกระโดด"
-  bounce: "อนิเมชั่น (เด้ง)"
-  bounceDescription: "ให้เนื้อหามีอนิเมชั่นเด้ง"
-  shake: "อนิเมชั่น (เขย่า)"
-  shakeDescription: "ให้เนื้อหามีภาพเคลื่อนไหวสั่น"
-  twitch: "แอนิเมชั่น (Twitch)"
-  twitchDescription: "ให้เนื้อหามีแอนิเมชั่นกระตุกอย่างแรง"
-  spin: "แอนิเมชั่น (สปิน)"
-  spinDescription: "ให้เนื้อหาเป็นภาพเคลื่อนไหวแบบหมุน"
-  x2: "ขนาดใหญ่"
-  x2Description: "แสดงเนื้อหาที่ใหญ่ขึ้น"
-  x3: "ใหญ่มาก"
-  x3Description: "แสดงเนื้อหาอีเว้นท์ที่ใหญ่ขึ้น"
-  x4: "ใหญ่อย่างไม่น่าเชื่อ"
-  x4Description: "แสดงผลเนื้อหาที่ใหญ่กว่าใหญ่กว่าขนาดใหญ่"
-  blur: "เบลอ"
-  blurDescription: "เบลอเนื้อหา จะแสดงผลอย่างชัดเจนต่อเมื่อวางเมาส์เหนือ"
-  font: "ตัวอักษร"
-  fontDescription: "ตั้งค่าตัวอักษรเพื่อแสดงเนื้อหาใน"
-  rainbow: "สายรุ้ง"
-  rainbowDescription: "ทำให้เนื้อหานั้นปรากฏเป็นสีรุ้ง"
-  sparkle: "กลิตเตอร์"
-  sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
-  rotate: "หมุนหน้าจอ"
-  rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
-  plain: "เรียบง่าย"
-  plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
   none: "ไม่ต้องแสดง"
   remote: "แสดงสำหรับผู้ใช้ระยะไกล"
@@ -1264,14 +1485,14 @@ _tutorial:
   step8_3: "คุณสามารถเปลี่ยนการตั้งค่านี้ในภายหลังได้ตลอดเวลานะ"
 _2fa:
   alreadyRegistered: "คุณได้ลงทะเบียนอุปกรณ์ยืนยันตัวตนแบบ 2 ชั้นแล้ว"
-  registerDevice: "ลงทะเบียนอุปกรณ์ใหม่"
-  registerKey: "ลงทะเบียนรหัสความปลอดภัย"
   step1: "ขั้นตอนแรก ติดตั้งแอปยืนยันตัวตน (เช่น {a} หรือ {b}) บนอุปกรณ์ของคุณ"
   step2: "จากนั้นสแกนรหัส QR ที่แสดงบนหน้าจอนี้"
   step2Url: "คุณยังสามารถป้อนบน URL นี้หากคุณใช้โปรแกรมเดสก์ท็อป:"
   step3: "ป้อนโทเค็นที่แอปของคุณให้มาเพื่อเสร็จสิ้นการตั้งค่า"
   step4: "นับจากนี้เป็นต้นไปการพยายามเข้าสู่ระบบในอนาคตนั้น อาจจะต้องขอโทเค็นในการเข้าสู่ระบบดังกล่าว"
   securityKeyInfo: "นอกจากนี้การตรวจสอบความถูกต้องด้วยลายนิ้วมือหรือ PIN แล้ว คุณยังสามารถตั้งค่าการตรวจสอบสิทธิ์ผ่านคีย์ความปลอดภัยของฮาร์ดแวร์ที่รองรับ FIDO2 เพื่อเพิ่มความปลอดภัยให้กับบัญชีของคุณ"
+  removeKeyConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
+  renewTOTPCancel: "ไม่เป็นไร"
 _permissions:
   "read:account": "ดูข้อมูลบัญชีของคุณ"
   "write:account": "แก้ไขข้อมูลบัญชีของคุณ"
@@ -1306,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "ดูรายการโพสต์ในแกลเลอรีที่ชอบของคุณ"
   "write:gallery-likes": "แก้ไขรายการโพสต์ในแกลเลอรีที่ชอบของคุณ"
 _auth:
+  shareAccessTitle: "การให้สิทธิ์แอปพลิเคชัน"
   shareAccess: "คุณต้องการอนุญาตให้ \"{name}\" เข้าถึงบัญชีนี้เลยมั้ย?"
   shareAccessAsk: "คุณแน่ใจแล้วจริงๆหรอว่าต้องการอนุญาตให้แอปพลิเคชันนี้เข้าถึงบัญชีของคุณแน่ใจแล้วหรอ?"
+  permission: "{name} ได้ขอสิทธิ์การเข้าถึงดังต่อไปนี้"
   permissionAsk: "แอปพลิเคชันนี้ขอสิทธิ์ดังต่อไปนี้"
   pleaseGoBack: "กรุณากลับไปที่แอปพลิเคชัน"
   callback: "กำลังกลับไปที่แอปพลิเคชัน"
   denied: "ปฏิเสธการเข้าใช้"
+  pleaseLogin: "กรุณาเข้าสู่ระบบเพื่ออนุมัติแอปพลิเคชัน"
 _antennaSources:
   all: "โน้ตทั้งหมด"
   homeTimeline: "โน้ตจากผู้ใช้ที่ติดตาม"
   users: "โน้ตจากผู้ใช้ที่เฉพาะเจาะจง"
   userList: "โน้ตจากรายชื่อผู้ใช้ที่ระบุ"
-  userGroup: "โน้ตจากผู้ใช้ในกลุ่มที่ระบุ"
 _weekday:
   sunday: "วันอาทิตย์"
   monday: "วันจันทร์"
@@ -1392,8 +1615,6 @@ _visibility:
   followersDescription: "ทำให้ผู้ติดตามนั้นมองเห็นแค่คุณเท่านั้น"
   specified: "ไดเร็ค"
   specifiedDescription: "ทำให้มองเห็นได้เฉพาะผู้ใช้ที่ระบุเท่านั้น"
-  localOnly: "เฉพาะท้องถิ่น"
-  localOnlyDescription: "ผู้ใช้ระยะไกลนั้นไม่สามารถมองเห็นได้"
 _postForm:
   replyPlaceholder: "ตอบกลับโน้ตนี้..."
   quotePlaceholder: "อ้างโน้ตนี้..."
@@ -1531,15 +1752,13 @@ _notification:
   youGotReply: "{name} ตอบกลับถึงคุณ"
   youGotQuote: "{name} อ้างถึงคุณ"
   youRenoted: "รีโน้ตจาก {name}"
-  youGotMessagingMessageFromUser: "{name} ได้ส่งข้อความแชทถึงคุณ"
-  youGotMessagingMessageFromGroup: "ข้อความแชทถูกส่งไปยัง {name} กลุ่ม"
   youWereFollowed: "ได้ติดตามคุณ"
   youReceivedFollowRequest: "คุณมีคำขอติดตามใหม่น่ะ"
   yourFollowRequestAccepted: "คำขอติดตามของคุณได้รับการยอมรับแล้วน่ะ"
-  youWereInvitedToGroup: "{userName} ได้เชิญคุณเข้ากลุ่ม"
   pollEnded: "โพลสำรวจความคิดเห็นผลลัพธ์มีพร้อมใช้งาน"
   unreadAntennaNote: "เสาอากาศ {name}"
   emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
+  achievementEarned: "รับความสำเร็จ"
   _types:
     all: "ทั้งหมด"
     follow: "กำลังติดตาม"
@@ -1551,7 +1770,6 @@ _notification:
     pollEnded: "โพลนี้สิ้นสุดลงแล้ว"
     receiveFollowRequest: "ได้รับคำขอติดตาม\n"
     followRequestAccepted: "ยอมรับคำขอติดตาม"
-    groupInvited: "ได้รับคำเชิญเข้ากลุ่ม"
     app: "การแจ้งเตือนจากแอปที่มีลิงก์"
   _actions:
     followBack: "ติดตามกลับด้วย"
@@ -1581,5 +1799,6 @@ _deck:
     tl: "ไทม์ไลน์"
     antenna: "เสาอากาศ"
     list: "รายการ"
+    channel: "แชนแนล"
     mentions: "พูดถึง"
     direct: "ไดเร็ค"

locales/tr-TR.yml

@@ -48,8 +48,6 @@ smtpUser: "Kullanıcı Adı"
 smtpPass: "Şifre"
 user: "Kullanıcı"
 searchByGoogle: "Arama"
-_mfm:
-  search: "Arama"
 _sfx:
   notification: "Bildirim"
 _widgets:

locales/ug-CN.yml

@@ -2,5 +2,3 @@
 _lang_: "ياپونچە"
 search: "ئىزدەش"
 searchByGoogle: "ئىزدەش"
-_mfm:
-  search: "ئىزدەش"

locales/uk-UA.yml

@@ -109,6 +109,7 @@ clickToShow: "Натисніть для перегляду"
 sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
+reactions: "Реакції"
 reactionSetting: "Налаштування реакцій"
 reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
@@ -165,7 +166,7 @@ recipient: "Отримувач"
 annotation: "Коментарі"
 federation: "Федіверс"
 instances: "Інстанс"
-registeredAt: "Приєднався(лась)"
+registeredAt: "Реєстрація"
 latestRequestReceivedAt: "Останній запит прийнято"
 latestStatus: "Останній статус"
 storageUsage: "Використання простору"
@@ -262,7 +263,7 @@ activity: "Активність"
 images: "Зображення"
 birthday: "День народження"
 yearsOld: "{age} років"
-registeredDate: "Приєднався(лась)"
+registeredDate: "Приєднання"
 location: "Локація"
 theme: "Тема"
 themeForLightMode: "Світла тема"
@@ -386,13 +387,10 @@ about: "Інформація"
 aboutMisskey: "Про Misskey"
 administrator: "Адмін"
 token: "Токен"
-twoStepAuthentication: "Двохфакторна аутентифікація"
 moderator: "Модератор"
 moderation: "Модерація"
 nUsersMentioned: "Згадали: {n}"
 securityKey: "Ключ захисту"
-securityKeyName: "Назва ключа"
-registerSecurityKey: "Зареєструвати ключ захисту"
 lastUsed: "Востаннє використано"
 unregister: "Скасувати реєстрацію"
 passwordLessLogin: "Налаштувати вхід без пароля"
@@ -410,24 +408,15 @@ markAsReadAllTalkMessages: "Позначити всі повідомлення
 help: "Допомога"
 inputMessageHere: "Введіть повідомлення тут"
 close: "Закрити"
-group: "Група"
-groups: "Групи"
-createGroup: "Створити групу"
-ownedGroups: "Власні групи"
-joinedGroups: "Членство в групах"
 invites: "Запросити"
-groupName: "Назва групи"
 members: "Учасники"
 transfer: "Передача"
-messagingWithUser: "Чат з користувачами"
-messagingWithGroup: "Чат з групою"
 title: "Тема"
 text: "Текст"
 enable: "Увімкнути"
 next: "Далі"
 retype: "Введіть ще раз"
 noteOf: "Нотатка {user}"
-inviteToGroup: "Запрошення до групи"
 quoteAttached: "Цитата"
 quoteQuestion: "Ви хочете додати цитату?"
 noMessagesYet: "Ще немає повідомлень"
@@ -449,18 +438,13 @@ passwordMatched: "Все вірно"
 passwordNotMatched: "Паролі не співпадають"
 signinWith: "Увійти за допомогою {x}"
 signinFailed: "Не вдалося увійти. Введені ім’я користувача або пароль неправильнi."
-tapSecurityKey: "Торкніться ключа безпеки"
 or: "або"
 language: "Мова"
 uiLanguage: "Мова інтерфейсу"
-groupInvited: "Запрошення до групи"
 aboutX: "Про {x}"
 disableDrawer: "Не використовувати висувні меню"
-youHaveNoGroups: "Немає груп"
-joinOrCreateGroup: "Отримуйте запрошення до груп або створюйте свої власні групи."
 noHistory: "Історія порожня"
 signinHistory: "Історія входів"
-disableAnimatedMfm: "Відключити анімації MFM"
 doing: "Виконується"
 category: "Категорія"
 tags: "Теги"
@@ -528,7 +512,7 @@ state: "Стан"
 sort: "Сортування"
 ascendingOrder: "За зростанням"
 descendingOrder: "За спаданням"
-scratchpad: "Чернетка"
+scratchpad: "Scratchpad"
 scratchpadDescription: "Scratchpad надає середовище для експериментів з AiScript. Ви можете писати, виконувати його і тестувати взаємодію з Misskey."
 output: "Вихід"
 script: "Скрипт"
@@ -586,7 +570,7 @@ pluginTokenRequestedDescription: "Цей плагін зможе викорис
 notificationType: "Тип сповіщення"
 edit: "Редагувати"
 useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
-emailServer: "Сервер електронної пошти"
+emailServer: "Email сервер"
 enableEmail: "Увімкнути функцію доставки пошти"
 emailConfigInfo: "Використовується для підтвердження електронної пошти підчас реєстрації, а також для відновлення паролю."
 email: "E-mail"
@@ -687,7 +671,7 @@ pageLikesCount: "Кількість отриманих вподобань сто
 pageLikedCount: "Кількість вподобаних сторінок"
 contact: "Контакт"
 useSystemFont: "Використовувати стандартний шрифт системи"
-clips: "Добірка"
+clips: "Добірки"
 experimentalFeatures: "Експериментальні функції"
 developer: "Розробник"
 makeExplorable: "Зробіть обліковий запис видимим у розділі \"Огляд\""
@@ -825,8 +809,6 @@ deleteAccountConfirm: "Це незворотно видалить ваш ака
 incorrectPassword: "Неправильний пароль."
 voteConfirm: "Підтверджуєте свій голос за \"{choice}\"?"
 hide: "Сховати"
-leaveGroup: "Залишити групу"
-leaveGroupConfirm: "Залишити \"{name}\"?"
 welcomeBackWithName: "З поверненням, {name}!"
 clickToFinishEmailVerification: "Натисніть [{ok}], щоб завершити перевірку email."
 overridedDeviceKind: "Тип пристрою"
@@ -892,9 +874,239 @@ unsubscribePushNotification: "Вимкнути push-сповіщення"
 windowMaximize: "Розгорнути"
 windowRestore: "Відновити"
 caption: "Підпис"
+tools: "Інструменти"
 like: "Вподобати"
+unlike: "Не вподобати"
+numberOfLikes: "Вподобання"
 show: "Відображення"
 color: "Колір"
+achievements: "Досягнення"
+_achievements:
+  earnedAt: "Відкрито"
+  _types:
+    _notes1:
+      title: "Привіт, Misskey!"
+      description: "Перша нотатка"
+      flavor: "Приємного часу з Misskey!"
+    _notes10:
+      title: "Декілька нотаток"
+      description: "10 нотаток відправлено"
+    _notes100:
+      title: "Купа нотаток"
+      description: "100 нотаток відправлено"
+    _notes500:
+      title: "Все в нотатках"
+      description: "500 нотаток відправлено"
+    _notes1000:
+      title: "Гора нотаток"
+      description: "1 000 нотаток відправлено"
+    _notes5000:
+      title: "Переповнюючі нотатки"
+      description: "5 000 нотаток відправлено"
+    _notes10000:
+      title: "Супернотатка"
+      description: "10 000 нотаток відправлено"
+    _notes20000:
+      title: "Треба Більше Нотаток"
+      description: "20 000 нотаток відправлено"
+    _notes30000:
+      title: "Нотатки нотатки нотатки"
+      description: "30 000 нотаток відправлено"
+    _notes40000:
+      title: "Фабрика нотаток"
+      description: "40 000 нотаток відправлено"
+    _notes50000:
+      title: "Планета нотаток"
+      description: "50 000 нотаток відправлено"
+    _notes60000:
+      title: "Нотатковий квазар"
+      description: "60 000 нотаток відправлено"
+    _notes70000:
+      title: "Чорна нотаткова діра"
+      description: "70 000 нотаток відправлено"
+    _notes80000:
+      title: "Галактика нотаток"
+      description: "80 000 нотаток відправлено"
+    _notes90000:
+      title: "Нотатковерс"
+      description: "90 000 нотаток відправлено"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "100 000 нотаток відправлено"
+      flavor: "Так багато потрібно сказати?"
+    _login3:
+      title: "Новачок I"
+      description: "3 дні користування загально"
+      flavor: "Відсьогодні називайте мене \"Місскіст\""
+    _login7:
+      title: "Новачок II"
+      description: "7 днів користування загально"
+      flavor: "Ви звикли до цього?"
+    _login15:
+      title: "Новачок III"
+      description: "15 днів користування загально"
+    _login30:
+      title: "Міскієць I"
+      description: "30 днів користування загально"
+    _login60:
+      title: "Міскієць II"
+      description: "60 днів користування загально"
+    _login100:
+      title: "Міскієць III"
+      description: "100 днів користування загально"
+      flavor: "Цей юзер лютий місскіст"
+    _login200:
+      title: "Завсідник I"
+      description: "200 днів користування загально"
+    _login300:
+      title: "Завсідник II"
+      description: "300 днів користування загально"
+    _login400:
+      title: "Завсідник III"
+      description: "400 днів користування загально"
+    _login500:
+      title: "Ветеран I"
+      description: "500 днів користування загально"
+      flavor: "Meine Kameraden, ich liebe sie, die Notizen."
+    _login600:
+      title: "Ветеран II"
+      description: "600 днів користування загально"
+    _login700:
+      title: "Ветеран III"
+      description: "700 днів користування загально"
+    _login800:
+      title: "Майстер нотаток I"
+      description: "800 днів користування загально"
+    _login900:
+      title: "Майстер нотаток II"
+      description: "900 днів користування загально"
+    _login1000:
+      title: "Майстер нотаток III"
+      description: "1000 днів користування загально"
+      flavor: "Дякуємо, що користуєтеся Misskey!"
+    _noteClipped1:
+      title: "Не можна не зберегти"
+      description: "Перша нотатка у добірці"
+    _noteFavorited1:
+      title: "Дивитися на зірки"
+    _myNoteFavorited1:
+      title: "У пошуках зірок"
+    _profileFilled:
+      title: "Повна готовність"
+      description: "Профіль заповнено"
+    _markedAsCat:
+      title: "Я кіт"
+      description: "Позначено як акаунт кота"
+      flavor: "Я дам тобі ім'я пізніше"
+    _following1:
+      title: "Перша підписка"
+    _following10:
+      title: "Продовжуй, продовжуй"
+    _following50:
+      title: "Багато друзів"
+      description: "Кількість підписок сягнула 50"
+    _following100:
+      title: "100 друзів"
+      description: "Кількість підписок сягнула 100"
+    _following300:
+      title: "Надлишок друзів"
+      description: "Кількість підписок сягнула 300"
+    _followers1:
+      title: "Перший підписник"
+      description: "З'явився перший підписник"
+    _followers10:
+      title: "Follow me!"
+      description: "Кількість підписників досягла 10"
+    _followers50:
+      description: "Кількість підписників досягла 50"
+    _followers100:
+      title: "Популярна особа"
+      description: "Кількість підписників досягла 100"
+    _followers300:
+      title: "Ставайте в чергу"
+      description: "Кількість підписників досягла 300"
+    _followers500:
+      title: "Радіовежа"
+      description: "Кількість підписників досягла 500"
+    _followers1000:
+      title: "Інфлюенсер"
+      description: "Кількість підписників досягла 1000"
+    _collectAchievements30:
+      title: "Збирач досягнень"
+      description: "Отримано 30 досягнень"
+    _viewAchievements3min:
+      title: "Шанувальник досягнень"
+      description: "Переглядати список досягнень принаймні 3 хвилини"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Відправлено \"I ❤ #Misskey\""
+      flavor: "Дякуємо вам, що користуєтесь Misskey!  – команда розробників"
+    _foundTreasure:
+      title: "Пошуки скарбів"
+      description: "Ви знайшли прихований скарб"
+    _client30min:
+      title: "Коротка перерва"
+      description: "З моменту запуску клієнта минуло 30 хвилин"
+    _noteDeletedWithin1min:
+      title: "Не зважай"
+      description: "Допис видалено протягом 1 хвилини після публікації"
+    _postedAtLateNight:
+      title: "Нічне життя"
+      description: "Відправити нотатку посеред ночі"
+      flavor: "Час лягати спати"
+    _postedAt0min0sec:
+      title: "Сигнал часу"
+      description: "Відправити нотатку о 00:00"
+    _selfQuote:
+      title: "Самопосилання"
+      description: "Процитувати власну нотатку"
+    _htl20npm:
+      title: "Плинна стрічка"
+      description: "Перевищити швидкість домашньої стрічки 20npm (нотаток на хвилину)"
+    _viewInstanceChart:
+      title: "Аналітик"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "Вивести \"hello world\" у Скретчпаді"
+    _reactWithoutRead:
+      title: "Прочитали як слід?"
+      description: "Реакція на нотатку, що містить понад 100 символів, протягом 3 секунд після її публікації"
+    _clickedClickHere:
+      title: "Натисніть тут"
+      description: "Натиснуто тут"
+    _justPlainLucky:
+      title: "Просто вдача"
+      description: "Можна отримати з ймовірністю 0,01% кожні 10 секунд"
+    _setNameToSyuilo:
+      title: "Комплекс бога"
+      description: "Встановлено ім'я \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "Перша річниця"
+      description: "Минув рік з моменту створення акаунта"
+    _passedSinceAccountCreated2:
+      title: "Друга річниця"
+      description: "Минуло 2 роки з моменту створення акаунта"
+    _passedSinceAccountCreated3:
+      title: "Третя річниця"
+      description: "Минуло 3 роки з моменту створення акаунта"
+    _loggedInOnBirthday:
+      title: "З Днем народження!"
+      description: "Увійти у свій день народження"
+    _loggedInOnNewYearsDay:
+      title: "З Новим роком!"
+      description: "Увійшли в перший день року"
+    _cookieClicked:
+      flavor: "Чекайте, це вірний сайт?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Відправити посилання на \"Brain Diver\""
+      flavor: "Misskey-Misskey La-Tu-Ma"
+_role:
+  priority: "Пріоритет"
+  _priority:
+    low: "Низький"
+    middle: "Середній"
+    high: "Високий"
 _sensitiveMediaDetection:
   sensitivity: "Чутливість детектування"
   setSensitiveFlagAutomatically: "Позначити як NSFW"
@@ -920,6 +1132,7 @@ _accountDelete:
 _ad:
   back: "Назад"
   reduceFrequencyOfThisAd: "Показувати цю рекламу менше"
+  hide: "Не відображати"
 _gallery:
   my: "Моя галерея"
   liked: "Вподобане"
@@ -964,65 +1177,6 @@ _nsfw:
   respect: "Приховувати NSFW медіа"
   ignore: "Не приховувати NSFW медіа"
   force: "Приховувати всі медіа файли"
-_mfm:
-  cheatSheet: " Довідка MFM"
-  intro: "MFM це ексклюзивна мова розмітки тексту в Misskey, яку можна використовувати в багатьох місцях. Тут ви можете переглянути приклади її синтаксису."
-  dummy: "Misskey розширює світ Федіверсу"
-  mention: "Згадка"
-  mentionDescription: "За допомогою знака \"@\" перед ім'ям можна згадати конкретного користувача."
-  hashtag: "Хештеґ"
-  hashtagDescription: "За допомогою знака \"решітка\" перед словом задається хештег."
-  url: "URL"
-  urlDescription: "Відображаються URL-адреси."
-  link: "Посилання"
-  linkDescription: "Окремі частини тексту можуть містити посилання"
-  bold: "Жирний шрифт"
-  boldDescription: "Виділяє літери, роблячи їх товще"
-  small: "Дрібний шрифт"
-  smallDescription: "Робить текст маленьким і тонким"
-  center: "По центру"
-  centerDescription: "Показує вміст у центрі"
-  inlineCode: "Код (у рядку)"
-  inlineCodeDescription: "Показує фрагмент тексту у рядку як програмний код"
-  blockCode: "Код (блок)"
-  blockCodeDescription: "Показує кілька рядків тексту як блок програмного кода"
-  inlineMath: "Формула (у рядку)"
-  inlineMathDescription: "Відображення математичних формул (KaTeX) у рядку"
-  blockMath: "Формули (блок)"
-  blockMathDescription: "Відображати багаторядкові формули (KaTeX) блоками"
-  quote: "Цитата"
-  quoteDescription: "Відображає зміст як цитату."
-  emoji: "Кастомні емоджі"
-  emojiDescription: "Щоб показати нетиповий емоджі, потрібно ввести його назву в двокрапках."
-  search: "Пошук"
-  searchDescription: "Відображає вікно пошуку з попередньо введеним текстом"
-  flip: "Перевернути"
-  flipDescription: "Віддзеркалює вміст по горизонталі або вертикалі"
-  jelly: "Анімація (желе)"
-  jellyDescription: "Створює желеподібну анімацію"
-  tada: "Анімація (Тада!)"
-  tadaDescription: "Створює анімацію з відчуттям \"Тада!\""
-  jump: "Анімація (стрибки)"
-  jumpDescription: "Показує стрибаючу анімацію"
-  bounce: "Анімація (пружина)"
-  bounceDescription: "Надає вмісту стрибаючу анімацію."
-  shake: "Анімація (Shake)"
-  shakeDescription: "Надає вмісту тремтливу анімацію."
-  twitch: "Анімація (Twitch)"
-  spin: "Анімація (Spin)"
-  x2: "Великий"
-  x2Description: "Показує контент збільшеним."
-  x3: "Дуже великий"
-  x3Description: "Показує контент ще більшим."
-  x4: "Надзвичайно великий"
-  x4Description: "Показує контент надзвичайно великим."
-  blur: "Розмиття"
-  blurDescription: "Цей ефект зробить контент розмитим. Контент можна зробити чітким, якщо навести на нього вказівник миші."
-  font: "Шрифт"
-  fontDescription: "Встановлює шрифт для контенту."
-  rotate: "Обертати"
-  plain: "Звичайний"
-  plainDescription: "Деактивує всі ефекти MFM, що містяться в цьому ефекті MFM."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
@@ -1155,12 +1309,12 @@ _tutorial:
   step1_1: "Ласкаво просимо!"
   step1_2: "Ця сторінка має назву \"стрічка подій\". На ній з'являються записи користувачів на яких ви підписані."
   step1_3: "Наразі ваша стрічка порожня, оскільки ви ще не написали жодної нотатки і не підписані на інших."
-  step2_1: "Перш ніж зробити запис або підписатись на когось, спочатку заповніть свій обліковий запис."
-  step2_2: "Надання деякої інформації про себе дозволить іншим користувачам підписатись на вас."
+  step2_1: "Перш ніж зробити запис або підписатись на когось, заповніть свій профіль."
+  step2_2: "Надання деякої інформації про себе допоможе іншим користувачам вирішити підписатись на вас."
   step3_1: "Ви успішно налаштували свій обліковий запис?"
   step3_2: "Наступним кроком є написання нотатки. Це можна зробити, натиснувши зображення олівця на екрані."
   step3_3: "Після написання вмісту ви можете опублікувати його, натиснувши кнопку у верхньому правому куті форми."
-  step3_4: "Не знаєте що написати? Спробуйте \"налаштовую свій msky\"!"
+  step3_4: "Не знаєте що написати? Спробуйте \"Привіт, Misskey!\""
   step4_1: "Ви розмістили свій перший запис?"
   step4_2: "Ура! Ваш перший запис відображається на вашій стрічці подій."
   step5_1: "Настав час оживити вашу стрічку подій підписавшись на інших користувачів."
@@ -1177,13 +1331,12 @@ _tutorial:
   step8_3: "Ви завжди можете змінити цей параметр пізніше."
 _2fa:
   alreadyRegistered: "Двофакторна автентифікація вже налаштована."
-  registerDevice: "Зареєструвати новий пристрій"
-  registerKey: "Зареєструвати новий ключ безпеки"
   step1: "Спершу встановіть на свій пристрій програму автентифікації (наприклад {a} або {b})."
   step2: "Потім відскануйте QR-код, який відображається на цьому екрані."
   step2Url: "Ви також можете ввести цю URL-адресу, якщо використовуєте програму для ПК:"
   step3: "Щоб завершити налаштування, введіть токен, наданий вашою програмою."
   step4: "Відтепер будь-які майбутні спроби входу вимагатимуть такого токена."
+  renewTOTPCancel: "Не зараз"
 _permissions:
   "read:account": "Переглядати дані профілю"
   "write:account": "Змінити дані акаунту"
@@ -1292,8 +1445,6 @@ _visibility:
   followersDescription: "Тільки для підписників"
   specified: "Особисто"
   specifiedDescription: "Лише для певних користувачів"
-  localOnly: "Локально"
-  localOnlyDescription: "Приховано для віддалених користувачів"
 _postForm:
   replyPlaceholder: "Відповідь на цю нотатку..."
   quotePlaceholder: "Прокоментуйте цю нотатку..."
@@ -1418,12 +1569,10 @@ _notification:
   youGotReply: "{name} відповідає"
   youGotQuote: "{name} цитує вас"
   youRenoted: "{name} поширює"
-  youGotMessagingMessageFromUser: "Повідомлення від {name}"
-  youGotMessagingMessageFromGroup: "Нове повідомлення в групі {name}"
   youWereFollowed: "Новий підписник"
   youReceivedFollowRequest: "Ви отримали запит на підписку"
   yourFollowRequestAccepted: "Запит на підписку прийнято"
-  youWereInvitedToGroup: "Запрошення до групи"
+  achievementEarned: "Досягнення відкрито"
   _types:
     all: "Все"
     follow: "Підписки"
@@ -1434,7 +1583,6 @@ _notification:
     reaction: "Реакції"
     receiveFollowRequest: "Запити на підписку"
     followRequestAccepted: "Прийняті підписки"
-    groupInvited: "Запрошення до груп"
     app: "Сповіщення від додатків"
   _actions:
     reply: "Відповісти"
@@ -1461,5 +1609,6 @@ _deck:
     tl: "Стрічка"
     antenna: "Антени"
     list: "Списки"
+    channel: "Канали"
     mentions: "Згадки"
     direct: "Особисте"

locales/vi-VN.yml

@@ -107,6 +107,7 @@ clickToShow: "Nhấn để xem"
 sensitive: "Nhạy cảm"
 add: "Thêm"
 reaction: "Biểu cảm"
+reactions: "Biểu cảm"
 reactionSetting: "Chọn những biểu cảm hiển thị"
 reactionSettingDescription2: "Kéo để sắp xếp, nhấn để xóa, nhấn \"+\" để thêm."
 rememberNoteVisibility: "Lưu kiểu tút mặc định"
@@ -382,13 +383,10 @@ about: "Giới thiệu"
 aboutMisskey: "Về Misskey"
 administrator: "Quản trị viên"
 token: "Token"
-twoStepAuthentication: "Xác minh 2 bước"
 moderator: "Kiểm duyệt viên"
 moderation: "Kiểm duyệt"
 nUsersMentioned: "Dùng bởi {n} người"
 securityKey: "Khóa bảo mật"
-securityKeyName: "Tên khoá"
-registerSecurityKey: "Đăng ký khóa bảo mật"
 lastUsed: "Dùng lần cuối"
 unregister: "Hủy đăng ký"
 passwordLessLogin: "Đăng nhập không mật khẩu"
@@ -406,24 +404,15 @@ markAsReadAllTalkMessages: "Đánh dấu tất cả các tin nhắn là đã đ
 help: "Trợ giúp"
 inputMessageHere: "Nhập nội dung tin nhắn"
 close: "Đóng"
-group: "Nhóm"
-groups: "Các nhóm"
-createGroup: "Tạo nhóm"
-ownedGroups: "Nhóm tôi quản lý"
-joinedGroups: "Nhóm tôi tham gia"
 invites: "Mời"
-groupName: "Tên nhóm"
 members: "Thành viên"
 transfer: "Chuyển giao"
-messagingWithUser: "Nhắn riêng"
-messagingWithGroup: "Chat nhóm"
 title: "Tựa đề"
 text: "Nội dung"
 enable: "Bật"
 next: "Kế tiếp"
 retype: "Nhập lại"
 noteOf: "Tút của {user}"
-inviteToGroup: "Mời vào nhóm"
 quoteAttached: "Trích dẫn"
 quoteQuestion: "Trích dẫn lại?"
 noMessagesYet: "Chưa có tin nhắn"
@@ -445,18 +434,13 @@ passwordMatched: "Trùng khớp"
 passwordNotMatched: "Không trùng khớp"
 signinWith: "Đăng nhập bằng {x}"
 signinFailed: "Không thể đăng nhập. Vui lòng kiểm tra tên người dùng và mật khẩu của bạn."
-tapSecurityKey: "Nhấn mã bảo mật của bạn"
 or: "Hoặc"
 language: "Ngôn ngữ"
 uiLanguage: "Ngôn ngữ giao diện"
-groupInvited: "Bạn đã được mời tham gia nhóm"
 aboutX: "Giới thiệu {x}"
 disableDrawer: "Không dùng menu thanh bên"
-youHaveNoGroups: "Không có nhóm nào"
-joinOrCreateGroup: "Tham gia hoặc tạo một nhóm mới."
 noHistory: "Không có dữ liệu"
 signinHistory: "Lịch sử đăng nhập"
-disableAnimatedMfm: "Tắt MFM với chuyển động"
 doing: "Đang xử lý..."
 category: "Phân loại"
 tags: "Thẻ"
@@ -825,8 +809,6 @@ deleteAccountConfirm: "Điều này sẽ khiến tài khoản bị xóa vĩnh vi
 incorrectPassword: "Sai mật khẩu."
 voteConfirm: "Xác nhận bình chọn \"{choice}\"?"
 hide: "Ẩn"
-leaveGroup: "Rời khỏi nhóm"
-leaveGroupConfirm: "Bạn có chắc muốn rời khỏi nhóm \"{name}\"?"
 useDrawerReactionPickerForMobile: "Hiện bộ chọn biểu cảm dạng xổ ra trên điện thoại"
 welcomeBackWithName: "Chào mừng trở lại, {name}"
 clickToFinishEmailVerification: "Vui lòng nhấn [{ok}] để hoàn tất việc đăng ký."
@@ -897,6 +879,12 @@ move: "Di chuyển"
 like: "Thích"
 show: "Hiển thị"
 color: "Màu sắc"
+_role:
+  priority: "Ưu tiên"
+  _priority:
+    low: "Thấp"
+    middle: "Vừa"
+    high: "Cao"
 _sensitiveMediaDetection:
   description: "Giảm nỗ lực kiểm duyệt máy chủ thông qua việc tự động nhận dạng media NSFW thông qua học máy. Điều này sẽ làm tăng một chút áp lực trên máy chủ."
   sensitivity: "Phát hiện nhạy cảm"
@@ -929,6 +917,7 @@ _accountDelete:
 _ad:
   back: "Quay lại"
   reduceFrequencyOfThisAd: "Hiện ít lại"
+  hide: "Không hiển thị"
 _forgotPassword:
   enterEmail: "Nhập địa chỉ email bạn đã sử dụng để đăng ký. Một liên kết mà bạn có thể đặt lại mật khẩu của mình sau đó sẽ được gửi đến nó."
   ifNoEmail: "Nếu bạn không sử dụng email lúc đăng ký, vui lòng liên hệ với quản trị viên."
@@ -984,72 +973,6 @@ _nsfw:
   respect: "Ẩn nội dung NSFW"
   ignore: "Hiện nội dung NSFW"
   force: "Ẩn mọi media"
-_mfm:
-  cheatSheet: "MFM Cheatsheet"
-  intro: "MFM là ngôn ngữ phát triển độc quyền của Misskey có thể được sử dụng ở nhiều nơi. Tại đây bạn có thể xem danh sách tất cả các cú pháp MFM có sẵn."
-  dummy: "Misskey mở rộng thế giới Fediverse"
-  mention: "Nhắc đến"
-  mentionDescription: "Bạn có thể nhắc đến ai đó bằng cách sử dụng @tên người dùng."
-  hashtag: "Hashtag"
-  hashtagDescription: "Bạn có thể tạo một hashtag bằng #chữ hoặc #số."
-  url: "URL"
-  urlDescription: "Những URL có thể hiển thị."
-  link: "Đường dẫn"
-  linkDescription: "Các phần cụ thể của văn bản có thể được hiển thị dưới dạng URL."
-  bold: "In đậm"
-  boldDescription: "Nổi bật các chữ cái bằng cách làm chúng dày hơn."
-  small: "Nhỏ"
-  smallDescription: "Hiển thị nội dung nhỏ và mỏng."
-  center: "Giữa"
-  centerDescription: "Hiển thị nội dung căn giữa."
-  inlineCode: "Mã (Trong dòng)"
-  inlineCodeDescription: "Hiển thị tô sáng cú pháp trong dòng cho mã (chương trình)."
-  blockCode: "Mã (Khối)"
-  blockCodeDescription: "Hiển thị tô sáng cú pháp cho mã nhiều dòng (chương trình) trong một khối."
-  inlineMath: "Toán học (Trong dòng)"
-  inlineMathDescription: "Hiển thị công thức toán (KaTeX) trong dòng"
-  blockMath: "Toán học (Khối)"
-  blockMathDescription: "Hiển thị công thức toán học nhiều dòng (KaTeX) trong một khối"
-  quote: "Trích dẫn"
-  quoteDescription: "Hiển thị nội dung dạng lời trích dạng."
-  emoji: "Tùy chỉnh emoji"
-  emojiDescription: "Hiển thị emoji với cú pháp :tên emoji:"
-  search: "Tìm kiếm"
-  searchDescription: "Hiển thị hộp tìm kiếm với văn bản được nhập trước."
-  flip: "Lật"
-  flipDescription: "Lật nội dung theo chiều ngang hoặc chiều dọc."
-  jelly: "Chuyển động (Thạch rau câu)"
-  jellyDescription: "Cho phép nội dung chuyển động giống như thạch rau câu."
-  tada: "Chuyển động (Tada)"
-  tadaDescription: "Cho phép nội dung chuyển động kiểu \"Tada!\"."
-  jump: "Chuyển động (Nhảy múa)"
-  jumpDescription: "Cho phép nội dung chuyển động nhảy nhót."
-  bounce: "Chuyển động (Cà tưng)"
-  bounceDescription: "Cho phép nội dung chuyển động cà tưng."
-  shake: "Chuyển động (Rung)"
-  shakeDescription: "Cho phép nội dung chuyển động rung lắc."
-  twitch: "Chuyển động (Co rút)"
-  twitchDescription: "Cho phép nội dung chuyển động co rút."
-  spin: "Chuyển động (Xoay tít)"
-  spinDescription: "Cho phép nội dung chuyển động xoay tít."
-  x2: "Lớn"
-  x2Description: "Hiển thị nội dung cỡ lớn hơn."
-  x3: "Rất lớn"
-  x3Description: "Hiển thị nội dung cỡ lớn hơn nữa."
-  x4: "Khổng lồ"
-  x4Description: "Hiển thị nội dung cỡ khổng lồ."
-  blur: "Làm mờ"
-  blurDescription: "Làm mờ nội dung. Nó sẽ được hiển thị rõ ràng khi di chuột qua."
-  font: "Phông chữ"
-  fontDescription: "Chọn phông chữ để hiển thị nội dung."
-  rainbow: "Cầu vồng"
-  rainbowDescription: "Làm cho nội dung hiển thị với màu sắc cầu vồng."
-  sparkle: "Lấp lánh"
-  sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
-  rotate: "Xoay"
-  rotateDescription: "Xoay nội dung theo một góc cụ thể."
-  plain: "Đơn giản"
-  plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
   none: "Không hiển thị"
   remote: "Hiện cho người dùng từ máy chủ khác"
@@ -1209,14 +1132,13 @@ _tutorial:
   step7_3: "Bây giờ, chúc may mắn và vui vẻ với Misskey! 🚀"
 _2fa:
   alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
-  registerDevice: "Đăng ký một thiết bị"
-  registerKey: "Đăng ký một mã bảo vệ"
   step1: "Trước tiên, hãy cài đặt một ứng dụng xác minh (chẳng hạn như {a} hoặc {b}) trên thiết bị của bạn."
   step2: "Sau đó, quét mã QR hiển thị trên màn hình này."
   step2Url: "Bạn cũng có thể nhập URL này nếu sử dụng một chương trình máy tính:"
   step3: "Nhập mã token do ứng dụng của bạn cung cấp để hoàn tất thiết lập."
   step4: "Kể từ bây giờ, những lần đăng nhập trong tương lai sẽ yêu cầu mã token đăng nhập đó."
   securityKeyInfo: "Bên cạnh xác minh bằng vân tay hoặc mã PIN, bạn cũng có thể thiết lập xác minh thông qua khóa bảo mật phần cứng hỗ trợ FIDO2 để bảo mật hơn nữa cho tài khoản của mình."
+  removeKeyConfirm: "Xóa bản sao lưu {name}?"
 _permissions:
   "read:account": "Xem thông tin tài khoản của bạn"
   "write:account": "Sửa thông tin tài khoản của bạn"
@@ -1262,7 +1184,6 @@ _antennaSources:
   homeTimeline: "Tút từ những người đã theo dõi"
   users: "Tút từ những người cụ thể"
   userList: "Tút từ danh sách người dùng cụ thể"
-  userGroup: "Tút từ người dùng trong một nhóm cụ thể"
 _weekday:
   sunday: "Chủ Nhật"
   monday: "Thứ Hai"
@@ -1334,8 +1255,6 @@ _visibility:
   followersDescription: "Dành riêng cho người theo dõi"
   specified: "Nhắn riêng"
   specifiedDescription: "Chỉ người được nhắc đến mới thấy"
-  localOnly: "Chỉ trên máy chủ"
-  localOnlyDescription: "Không hiển thị với người ở máy chủ khác"
 _postForm:
   replyPlaceholder: "Trả lời tút này"
   quotePlaceholder: "Trích dẫn tút này"
@@ -1463,12 +1382,9 @@ _notification:
   youGotReply: "{name} trả lời bạn"
   youGotQuote: "{name} trích dẫn tút của bạn"
   youRenoted: "{name} đăng lại tút của bạn"
-  youGotMessagingMessageFromUser: "{name} nhắn tin cho bạn"
-  youGotMessagingMessageFromGroup: "Một tin nhắn trong nhóm {name}"
   youWereFollowed: "đã theo dõi bạn"
   youReceivedFollowRequest: "Bạn vừa có một yêu cầu theo dõi"
   yourFollowRequestAccepted: "Yêu cầu theo dõi của bạn đã được chấp nhận"
-  youWereInvitedToGroup: "Bạn đã được mời tham gia nhóm"
   pollEnded: "Cuộc bình chọn đã kết thúc"
   emptyPushNotificationMessage: "Đã cập nhật thông báo đẩy"
   _types:
@@ -1482,7 +1398,6 @@ _notification:
     pollEnded: "Bình chọn kết thúc"
     receiveFollowRequest: "Yêu cầu theo dõi"
     followRequestAccepted: "Yêu cầu theo dõi được chấp nhận"
-    groupInvited: "Mời vào nhóm"
     app: "Từ app liên kết"
   _actions:
     followBack: "đã theo dõi lại bạn"
@@ -1512,5 +1427,6 @@ _deck:
     tl: "Bảng tin"
     antenna: "Trạm phát sóng"
     list: "Danh sách"
+    channel: "Kênh"
     mentions: "Lượt nhắc"
     direct: "Nhắn riêng"

locales/zh-CN.yml

@@ -103,6 +103,8 @@ renoted: "已转发。"
 cantRenote: "该帖无法转发。"
 cantReRenote: "转发无法被再次转发。"
 quote: "引用"
+inChannelRenote: "在频道内转发"
+inChannelQuote: "在频道内引用"
 pinnedNote: "已置顶的帖子"
 pinned: "置顶"
 you: "您"
@@ -110,6 +112,7 @@ clickToShow: "点击以显示"
 sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
+reactions: "回应"
 reactionSetting: "在选择器中显示的回应"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
@@ -128,6 +131,7 @@ unblockConfirm: "确定要解除拉黑吗？"
 suspendConfirm: "要冻结吗？"
 unsuspendConfirm: "要解除冻结吗？"
 selectList: "选择列表"
+selectChannel: "选择频道"
 selectAntenna: "选择天线"
 selectWidget: "选择小工具"
 editWidgets: "编辑部件"
@@ -255,6 +259,8 @@ noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
 nUsersRead: "{n}人已读"
 agreeTo: "勾选则表示已阅读并同意{0}"
+agreeBelow: "同意以下观点"
+basicNotesBeforeCreateAccount: "基本注意事项"
 tos: "服务条款"
 start: "开始"
 home: "首页"
@@ -387,13 +393,10 @@ about: "关于"
 aboutMisskey: "关于 Misskey"
 administrator: "管理员"
 token: "Token (令牌)"
-twoStepAuthentication: "两步验证"
 moderator: "监察员"
 moderation: "管理"
 nUsersMentioned: "{n} 被提到"
 securityKey: "安全密钥"
-securityKeyName: "密钥名称"
-registerSecurityKey: "注册硬件安全密钥"
 lastUsed: "最后使用："
 unregister: "删除账户"
 passwordLessLogin: "无密码登录"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "将所有聊天标记为已读"
 help: "帮助"
 inputMessageHere: "在此键入信息"
 close: "关闭"
-group: "群组"
-groups: "群组"
-createGroup: "创建群组"
-ownedGroups: "拥有的群组"
-joinedGroups: "已加入的群组"
 invites: "邀请"
-groupName: "群组名"
 members: "成员"
 transfer: "转让"
-messagingWithUser: "与用户聊天"
-messagingWithGroup: "与群组聊天"
 title: "标题"
 text: "文本"
 enable: "启用"
 next: "下一个"
 retype: "重新输入"
 noteOf: "{user}的帖子"
-inviteToGroup: "群组邀请"
 quoteAttached: "已引用"
 quoteQuestion: "是否引用此链接内容？"
 noMessagesYet: "现在没有新的聊天"
@@ -450,20 +444,17 @@ passwordMatched: "密码一致"
 passwordNotMatched: "密码不一致"
 signinWith: "以{x}登录"
 signinFailed: "无法登录，请检查您的用户名和密码是否正确。"
-tapSecurityKey: "轻触硬件安全密钥"
 or: "或者"
 language: "语言"
 uiLanguage: "显示语言"
-groupInvited: "您有新的群组邀请"
 aboutX: "关于 {x}"
 emojiStyle: "emoji 的样式"
 native: "原生"
 disableDrawer: "不显示抽屉菜单"
-youHaveNoGroups: "没有群组"
-joinOrCreateGroup: "请加入一个现有的群组，或者创建新群组。"
 noHistory: "没有历史记录"
 signinHistory: "登录历史"
-disableAnimatedMfm: "禁用MFM动画"
+enableAdvancedMfm: "启用扩展MFM"
+enableAnimatedMfm: "启用MFM动画"
 doing: "正在进行"
 category: "类别"
 tags: "标签"
@@ -607,7 +598,7 @@ wordMute: "文字屏蔽"
 regexpError: "正则表达式错误"
 regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
 instanceMute: "实例的屏蔽"
-userSaysSomething: "{name}说了什么,但是被您屏蔽了"
+userSaysSomething: "{name}说了什么,但是被屏蔽词过滤了"
 makeActive: "启用"
 display: "显示"
 copy: "复制"
@@ -678,7 +669,7 @@ driveFilesCount: "网盘的文件数"
 driveUsage: "网盘的空间用量"
 noCrawle: "要求搜索引擎不索引该用户"
 noCrawleDescription: "要求搜索引擎不要收录（索引）您的用户页面，帖子，页面等。"
-lockedAccountInfo: "即使通过了关注请求，只要您不将帖子可见范围设置成“关注者”，任何人都可以看到您的帖子。"
+lockedAccountInfo: "即使启用该功能，只要您不将帖子可见范围设置为“仅关注者”，任何人都还是可以看到您的帖子。"
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
 loadRawImages: "添加附件图像的缩略图时使用原始图像质量"
 disableShowingAnimatedImages: "不播放动画"
@@ -826,15 +817,13 @@ makeReactionsPublicDescription: "将您发表过的回应设置成公开可见
 classic: "经典"
 muteThread: "屏蔽帖子列表"
 unmuteThread: "取消屏蔽帖子列表"
-ffVisibility: "连接的可见范围"
+ffVisibility: "关注关系的可见范围"
 ffVisibilityDescription: "您可以设置您的关注/关注者信息的公开范围"
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
 incorrectPassword: "密码错误"
 voteConfirm: "确定投给“{choice}” ？"
 hide: "隐藏"
-leaveGroup: "离开群组"
-leaveGroupConfirm: "确定离开「{name}」？"
 useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
 welcomeBackWithName: "欢迎回来，{name}"
 clickToFinishEmailVerification: "点击 [{ok}] 完成电子邮件地址认证。"
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "获取账户信息失败"
 rateLimitExceeded: "已超過速率限制"
 cropImage: "剪裁图像"
 cropImageAsk: "是否要裁剪图像？"
+cropYes: "已裁剪"
+cropNo: "就这样吧！"
 file: "文件"
 recentNHours: "最近{n}小时"
 recentNDays: "最近{n}天"
@@ -931,41 +922,319 @@ undefined: "未定义"
 assign: "分配"
 unassign: "取消分配"
 color: "颜色"
+manageCustomEmojis: "管理自定义表情符号"
+youCannotCreateAnymore: "抱歉，您无法再创建更多了。"
+cannotPerformTemporary: "暂时不可用"
+cannotPerformTemporaryDescription: "因操作过于频繁，暂时不可用，请稍后再试。"
+preset: "預設值"
+selectFromPresets: "從預設值中選擇"
+achievements: "成就"
+gotInvalidResponseError: "服务器无应答"
+gotInvalidResponseErrorDescription: "您的网络连接可能出现了问题, 或是远程服务器暂时不可用. 请稍后重试。"
+thisPostMayBeAnnoying: "这个帖子可能会让其他人感到困扰。"
+thisPostMayBeAnnoyingHome: "发到首页"
+thisPostMayBeAnnoyingCancel: "取消"
+thisPostMayBeAnnoyingIgnore: "就这样发布"
+collapseRenotes: "省略显示已经看过的转发内容"
+internalServerError: "内部服务器错误"
+internalServerErrorDescription: "内部服务器发生了预期外的错误"
+copyErrorInfo: "复制错误信息"
+_achievements:
+  earnedAt: "达成时间"
+  _types:
+    _notes1:
+      title: "初来乍到"
+      description: "第一次发帖"
+      flavor: "祝您在Misskey玩的愉快～"
+    _notes10:
+      title: "一些帖子"
+      description: "发布了10篇帖子"
+    _notes100:
+      title: "很多帖子"
+      description: "发布了100篇帖子"
+    _notes500:
+      title: "满是帖子"
+      description: "发布了500篇帖子"
+    _notes1000:
+      title: "积帖成山"
+      description: "发布了1,000篇帖子"
+    _notes5000:
+      title: "帖如泉涌"
+      description: "发布了5,000篇帖子"
+    _notes10000:
+      title: "超级帖"
+      description: "发布了10,000篇帖子"
+    _notes20000:
+      title: "还想要更多帖子"
+      description: "发布了20,000篇帖子"
+    _notes30000:
+      title: "帖子帖子帖子"
+      description: "发布了30,000篇帖子"
+    _notes40000:
+      title: "帖子工厂"
+      description: "发布了40,000篇帖子"
+    _notes50000:
+      title: "帖子星球"
+      description: "发布了50,000篇帖子"
+    _notes60000:
+      title: "帖子类星体"
+      description: "发布了60,000篇帖子"
+    _notes70000:
+      title: "帖子黑洞"
+      description: "发布了70,000篇帖子"
+    _notes80000:
+      title: "帖子星系"
+      description: "发布了80,000篇帖子"
+    _notes90000:
+      title: "帖子起源"
+      description: "发布了90,000篇帖子"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "发布了100,000篇帖子"
+      flavor: "真的有那么多可以写的东西吗？"
+    _login3:
+      title: "初学者 I"
+      description: "连续登录3天"
+      flavor: "今天开始我就是Misskist！"
+    _login7:
+      title: "初学者 II"
+      description: "连续登录7天"
+      flavor: "您开始习惯了吗？"
+    _login15:
+      title: "初学者 III"
+      description: "连续登录15天"
+    _login30:
+      title: "Misskist Ⅰ"
+      description: "连续登录30天"
+    _login60:
+      title: "Misskist Ⅱ"
+      description: "连续登录60天"
+    _login100:
+      title: "Misskist Ⅲ"
+      description: "总登入100天"
+      flavor: "那个用户，是Misskist喔"
+    _login200:
+      title: "定期联系Ⅰ"
+      description: "总登录天数200天"
+    _login300:
+      title: "定期联系Ⅱ"
+      description: "总登录天数300天"
+    _login400:
+      title: "定期联系Ⅲ"
+      description: "总登录天数400天"
+    _login500:
+      title: "老熟人Ⅰ"
+      description: "总登录天数500天"
+      flavor: "诸君，我喜欢贴文"
+    _login600:
+      title: "老熟人Ⅱ"
+      description: "总登录天数600天"
+    _login700:
+      title: "老熟人Ⅲ"
+      description: "总登录天数700天"
+    _login800:
+      title: "帖子大师Ⅰ"
+      description: "总登录天数800天"
+    _login900:
+      title: "帖子大师Ⅱ"
+      description: "总登录天数900天"
+    _login1000:
+      title: "帖子大师Ⅲ"
+      description: "总登录天数1000天"
+      flavor: "感谢您使用Misskey！"
+    _noteClipped1:
+      title: "忍不住要收藏到便签"
+      description: "第一次将贴文贴进便签"
+    _noteFavorited1:
+      title: "观星者"
+      description: "第一次将帖子加入收藏"
+    _myNoteFavorited1:
+      title: "想要星星"
+      description: "自己的帖子被其他人加入收藏了"
+    _profileFilled:
+      title: "整装待发"
+      description: "设置了个人资料"
+    _markedAsCat:
+      title: "我是猫"
+      description: "将账户设定为一只猫"
+      flavor: "还没有名字"
+    _following1:
+      title: "首次关注"
+      description: "第一次关注别人"
+    _following10:
+      title: "关注，跟随"
+      description: "关注超过10人"
+    _following50:
+      title: "我的朋友很多"
+      description: "关注超过50人"
+    _following100:
+      title: "我的朋友很多"
+      description: "关注超过100人"
+    _following300:
+      title: "朋友成群"
+      description: "关注数超过300"
+    _followers1:
+      title: "最初的关注者"
+      description: "第一次被关注"
+    _followers10:
+      title: "关注我吧！"
+      description: "拥有超过10名关注者"
+    _followers50:
+      title: "三五成群"
+      description: "拥有超过50名关注者"
+    _followers100:
+      title: "胜友如云"
+      description: "拥有超过100名关注者"
+    _followers300:
+      title: "排列成行"
+      description: "拥有超过300名关注者"
+    _followers500:
+      title: "信号塔"
+      description: "拥有超过500名关注者"
+    _followers1000:
+      title: "大影响家"
+      description: "拥有超过1000名关注者"
+    _collectAchievements30:
+      title: "成就收藏家"
+      description: "获得超过30个成就"
+    _viewAchievements3min:
+      title: "成就爱好者"
+      description: "盯着成就看三分钟"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "发布\"I ❤ #Misskey\"帖子"
+      flavor: "感谢您使用 Misskey ！ by 开发团队"
+    _foundTreasure:
+      title: "寻宝"
+      description: "发现了隐藏的宝藏"
+    _client30min:
+      title: "休息一下！"
+      description: "启动客户端超过30分钟"
+    _noteDeletedWithin1min:
+      title: "无话可说"
+      description: "发帖后一分钟内就将其删除"
+    _postedAtLateNight:
+      title: "夜猫子"
+      description: "深夜发布帖子"
+      flavor: "差不多该去睡了喔。"
+    _postedAt0min0sec:
+      title: "报时"
+      description: "在0点发布一篇帖子"
+      flavor: "嘣 嘣 嘣 Biu——！"
+    _selfQuote:
+      title: "自我引用"
+      description: "引用了自己的帖子"
+    _htl20npm:
+      title: "流动的时间线"
+      description: "在首页时间线的流速超过20npm"
+    _viewInstanceChart:
+      title: "分析师"
+      description: "查看了实例信息中的图表"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "在AiScript控制台中输出 hello world"
+    _open3windows:
+      title: "多窗口"
+      description: "打开了三个或更多的窗口"
+    _driveFolderCircularReference:
+      title: "循环引用"
+      description: "试图对网盘中的文件夹进行循环嵌套"
+    _reactWithoutRead:
+      title: "有好好读过吗？"
+      description: "在含有100字以上的帖子被发出三秒内做出回应"
+    _clickedClickHere:
+      title: "点这里"
+      description: "点了这里"
+    _justPlainLucky:
+      title: "超高校级的幸运"
+      description: "每10秒有0.01的概率自动获得"
+    _setNameToSyuilo:
+      title: "像神一样呐"
+      description: "将名称设定为syuilo"
+    _passedSinceAccountCreated1:
+      title: "一周年"
+      description: "账户创建时间超过1年"
+    _passedSinceAccountCreated2:
+      title: "二周年"
+      description: "账户创建时间超过2年"
+    _passedSinceAccountCreated3:
+      title: "三周年"
+      description: "账户创建时间超过3年"
+    _loggedInOnBirthday:
+      title: "生日快乐"
+      description: "在生日当天登录"
+    _loggedInOnNewYearsDay:
+      title: "恭贺新禧"
+      description: "在元旦登入"
+      flavor: "今年也请对本实例多多指教！"
+    _cookieClicked:
+      title: "点击饼干小游戏"
+      description: "点击了可疑的饼干"
+      flavor: "是不是软件有问题？"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "发布了包含Brain Diver链接的帖子"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "创建角色"
   edit: "编辑角色"
-  name: "用户组名称"
-  description: "用户组的描述"
-  permission: "用户组的权限"
+  name: "角色名称"
+  description: "角色描述"
+  permission: "角色权限"
   descriptionOfPermission: "<b>监察员</b>可以执行基本的审核操作。\n<b>管理员</b>可以更改实例的所有设置。"
   assignTarget: "授权对象"
-  descriptionOfAssignTarget: "<b>手动</b>指手动选择谁被包括在这个用户组中。\n<b>符合条件</b>指设置条件以自动包括符合条件的用户。"
+  descriptionOfAssignTarget: "<b>手动</b>指手动选择谁被包括在这个角色中。\n<b>符合条件</b>指设置条件以自动包括符合条件的用户。"
   manual: "手动"
   conditional: "符合条件"
   condition: "条件"
-  isConditionalRole: "这是一个条件控制的用户组。"
-  isPublic: "公开用户组"
-  descriptionOfIsPublic: "任何人都可以看到分配该用户组的用户，用户的个人资料也将显示该用户组。"
+  isConditionalRole: "这是一个条件控制的角色。"
+  isPublic: "角色公开"
+  descriptionOfIsPublic: "任何人都可以看到分配该角色的用户。而用户的个人资料也将显示该角色。"
   options: "选项"
+  policies: "策略"
   baseRole: "基本角色"
   useBaseValue: "使用基本角色的值"
   chooseRoleToAssign: "选择要分配的角色"
-  canEditMembersByModerator: "允许版主编辑成员"
-  descriptionOfCanEditMembersByModerator: "如果选中，版主和管理员都能够为用户分配/取消分配角色。如果未选中，则只有管理员可以执行此操作。"
+  iconUrl: "图标URL"
+  asBadge: "作为徽章显示"
+  descriptionOfAsBadge: "开启后，用户名旁边将会出现角色图标。"
+  canEditMembersByModerator: "允许监察者编辑成员"
+  descriptionOfCanEditMembersByModerator: "如果选中，监察者和管理员都能够为用户分配/取消分配角色。如果未选中，则只有管理员可以执行此操作。"
+  priority: "优先级"
+  _priority:
+    low: "低"
+    middle: "中"
+    high: "高"
   _options:
     gtlAvailable: "查看全局时间线"
     ltlAvailable: "查看本地时间线"
     canPublicNote: "允许公开发帖"
+    canInvite: "发放实例邀请码"
+    canManageCustomEmojis: "管理自定义表情符号"
     driveCapacity: "网盘容量"
+    pinMax: "帖子置顶数量限制"
     antennaMax: "可创建的最大天线数量"
+    wordMuteMax: "屏蔽词的字数限制"
+    webhookMax: "Webhook 创建数量限制"
+    clipMax: "便签创建数量限制"
+    noteEachClipsMax: "单个便签内的贴文数量限制"
+    userListMax: "用户列表创建数量限制"
+    userEachUserListsMax: "单个用户列表内用户数量限制"
+    rateLimitFactor: "速率限制"
+    descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
+    canHideAds: "可以隐藏广告"
   _condition:
     isLocal: "是本地用户"
     isRemote: "是远程用户"
     createdLessThan: "账户创建时间少于"
     createdMoreThan: "账户创建时间超过"
-    and: "全部符合"
-    or: "任一符合"
-    not: "不符合"
+    followersLessThanOrEq: "关注者不多于"
+    followersMoreThanOrEq: "关注者不少于"
+    followingLessThanOrEq: "关注中不多于"
+    followingMoreThanOrEq: "关注中不少于"
+    and: "符合以下全部条件"
+    or: "符合以下任一条件"
+    not: "不符合以下任何条件"
 _sensitiveMediaDetection:
   description: "可以使用机器学习技术自动检测敏感媒体，以便进行审核。服务器负载将略微增加。"
   sensitivity: "检测敏感度"
@@ -981,7 +1250,7 @@ _emailUnavailable:
   mx: "邮件服务器不正确"
   smtp: "邮件服务器没有响应"
 _ffVisibility:
-  public: "发布"
+  public: "公开"
   followers: "只有关注你的用户能看到"
   private: "私密"
 _signup:
@@ -998,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "返回"
   reduceFrequencyOfThisAd: "减少此广告的频率"
+  hide: "不显示"
 _forgotPassword:
   enterEmail: "请输入您验证账号时用的电子邮箱地址，密码重置链接将发送至该邮箱上。"
   ifNoEmail: "如果您没有使用电子邮件地址进行验证，请联系管理员。"
@@ -1053,72 +1323,6 @@ _nsfw:
   respect: "隐藏敏感内容"
   ignore: "不隐藏敏感内容"
   force: "总是隐藏内容"
-_mfm:
-  cheatSheet: "MFM代码速查表"
-  intro: "MFM是一种在Misskey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
-  dummy: "通过Misskey扩展联邦宇宙的世界"
-  mention: "提及"
-  mentionDescription: "可以使用 @+用户名 来指示特定用户"
-  hashtag: "话题标签"
-  hashtagDescription: "可以使用井号+文字来表示话题标签。"
-  url: "URL"
-  urlDescription: "可以表示URL地址。"
-  link: "链接"
-  linkDescription: "可以将部分文字和URL关联起来。"
-  bold: "粗体"
-  boldDescription: "可以将文字显示为粗体来表示强调。"
-  small: "缩小"
-  smallDescription: "可以使内容文字变小、变淡。"
-  center: "居中"
-  centerDescription: "可以将内容居中显示。"
-  inlineCode: "代码(内嵌)"
-  inlineCodeDescription: "将文字中的程序代码语法高亮显示。"
-  blockCode: "代码(块)"
-  blockCodeDescription: "语法高亮显示整块程序代码。"
-  inlineMath: "数学公式(内嵌)"
-  inlineMathDescription: "显示内嵌的KaTex公式。"
-  blockMath: "数学公式(块)"
-  blockMathDescription: "显示整块的多行KaTex数学公式。"
-  quote: "引用"
-  quoteDescription: "可以用来表示引用的内容。"
-  emoji: "自定义表情符号"
-  emojiDescription: "可以将自定义表情符号使用冒号括起来，就可以显示自定义表情符号了。"
-  search: "搜索"
-  searchDescription: "显示含有搜索内容示例的搜索框。"
-  flip: "翻转"
-  flipDescription: "将内容上下或左右翻转。"
-  jelly: "动画(果冻)"
-  jellyDescription: "显示果冻一样的动画效果。"
-  tada: "动画(锵锵)"
-  tadaDescription: "显示\"锵锵！\"的动画效果。"
-  jump: "动画(跳动)"
-  jumpDescription: "显示跳动的动画效果。"
-  bounce: "动画(弹性)"
-  bounceDescription: "显示弹性一样的动画效果。"
-  shake: "动画(摇晃)"
-  shakeDescription: "显示摇晃的动画效果。"
-  twitch: "动画(颤抖)"
-  twitchDescription: "显示强烈颤抖的动画效果。"
-  spin: "动画(旋转)"
-  spinDescription: "显示旋转的动画效果。"
-  x2: "大"
-  x2Description: "以大尺寸显示内容。"
-  x3: "非常大"
-  x3Description: "以更大尺寸显示内容。"
-  x4: "最大"
-  x4Description: "以最大尺寸显示内容。"
-  blur: "模糊"
-  blurDescription: "产生模糊效果。将鼠标指针放在上面即可将内容显示出来。"
-  font: "字体"
-  fontDescription: "可以设置内容所使用的字体。"
-  rainbow: "彩虹"
-  rainbowDescription: "用彩虹色来显示内容。"
-  sparkle: "闪光"
-  sparkleDescription: "添加发光粒子效果。"
-  rotate: "旋转"
-  rotateDescription: "旋转指定的角度。"
-  plain: "简洁"
-  plainDescription: "禁用所有内部语法。"
 _instanceTicker:
   none: "不显示"
   remote: "仅远程用户"
@@ -1281,14 +1485,14 @@ _tutorial:
   step8_3: "您也可以稍后再更改通知设置。"
 _2fa:
   alreadyRegistered: "此设备已被注册"
-  registerDevice: "注册设备"
-  registerKey: "注册密钥"
   step1: "首先，在您的设备上安装验证应用，例如{a}或{b}。"
   step2: "然后，扫描屏幕上显示的二维码。"
   step2Url: "在桌面应用程序中输入以下URL："
   step3: "输入您的应用提供的动态口令以完成设置。"
   step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
   securityKeyInfo: "您可以设置使用支持FIDO2的硬件安全密钥、设备上的指纹或PIN来保护您的登录过程。"
+  removeKeyConfirm: "您确定要删除 {name} 吗？"
+  renewTOTPCancel: "不用，谢谢"
 _permissions:
   "read:account": "查看账户信息"
   "write:account": "更改帐户信息"
@@ -1323,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "读取喜欢的图片"
   "write:gallery-likes": "操作喜欢的图片"
 _auth:
+  shareAccessTitle: "应用程序授权许可"
   shareAccess: "您要授权允许“{name}”访问您的帐户吗？"
   shareAccessAsk: "您确定要授权此应用程序访问您的帐户吗？"
+  permission: "{name}需要以下权限"
   permissionAsk: "这个应用程序需要以下权限"
   pleaseGoBack: "请返回到应用程序"
   callback: "回到应用程序"
   denied: "拒绝访问"
+  pleaseLogin: "在对应用进行授权许可之前，请先登录"
 _antennaSources:
   all: "所有帖子"
   homeTimeline: "已关注用户的帖子"
   users: "来自指定用户的帖子"
   userList: "来自指定列表中的帖子"
-  userGroup: "来自指定群组中用户的帖子"
 _weekday:
   sunday: "星期日"
   monday: "星期一"
@@ -1409,8 +1615,6 @@ _visibility:
   followersDescription: "仅发送至关注者"
   specified: "指定用户"
   specifiedDescription: "仅发送至指定用户"
-  localOnly: "仅限本地"
-  localOnlyDescription: "对远程用户不可见"
 _postForm:
   replyPlaceholder: "回复这个帖子..."
   quotePlaceholder: "引用这个帖子..."
@@ -1426,7 +1630,7 @@ _profile:
   name: "昵称"
   username: "用户名"
   description: "个人简介"
-  youCanIncludeHashtags: "您可以包含一个哈希标签。"
+  youCanIncludeHashtags: "你可以在个人简介中包含一个#标签。"
   metadata: "附加信息"
   metadataEdit: "附加信息编辑"
   metadataDescription: "最多可以在个人资料中以表格形式显示四条其他信息。"
@@ -1548,15 +1752,13 @@ _notification:
   youGotReply: "来自{name}的回复"
   youGotQuote: "来自{name}的引用"
   youRenoted: "来自{name}的转发"
-  youGotMessagingMessageFromUser: "来自{name}的聊天"
-  youGotMessagingMessageFromGroup: "来自{name}的群聊"
   youWereFollowed: "关注了你。"
   youReceivedFollowRequest: "您有新的关注请求"
   yourFollowRequestAccepted: "您的关注请求已通过"
-  youWereInvitedToGroup: "您有新的群组邀请"
   pollEnded: "问卷调查结果已生成。"
   unreadAntennaNote: "天线 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
+  achievementEarned: "获得成就"
   _types:
     all: "全部"
     follow: "关注中"
@@ -1568,7 +1770,6 @@ _notification:
     pollEnded: "问卷调查结束"
     receiveFollowRequest: "收到关注请求"
     followRequestAccepted: "关注请求已通过"
-    groupInvited: "加入群组邀请"
     app: "关联应用的通知"
   _actions:
     followBack: "回关"
@@ -1598,5 +1799,6 @@ _deck:
     tl: "时间线"
     antenna: "天线"
     list: "列表"
+    channel: "频道"
     mentions: "提及"
     direct: "指定用户"

locales/zh-TW.yml

@@ -103,13 +103,16 @@ renoted: "轉傳成功"
 cantRenote: "無法轉發此貼文。"
 cantReRenote: "無法轉傳之前已經轉傳過的內容。"
 quote: "引用"
+inChannelRenote: "在頻道內轉發"
+inChannelQuote: "在頻道內引用"
 pinnedNote: "已置頂的貼文"
 pinned: "置頂"
 you: "您"
 clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
-reaction: "情感"
+reaction: "反應"
+reactions: "情感"
 reactionSetting: "在選擇器中顯示反應"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
@@ -128,6 +131,7 @@ unblockConfirm: "確定解除封鎖此用戶？"
 suspendConfirm: "確定凍結此帳號？"
 unsuspendConfirm: "確定解凍此帳號？"
 selectList: "選擇清單"
+selectChannel: "選擇頻道"
 selectAntenna: "選擇天線"
 selectWidget: "選擇小工具"
 editWidgets: "編輯小工具"
@@ -239,7 +243,7 @@ removeAreYouSure: "確定要刪掉「{x}」嗎？"
 deleteAreYouSure: "確定要刪掉「{x}」嗎？"
 resetAreYouSure: "確定要重設嗎？"
 saved: "已儲存"
-messaging: "傳送訊息"
+messaging: "聊天"
 upload: "上傳"
 keepOriginalUploading: "保留原圖"
 keepOriginalUploadingDescription: "上傳圖片時保留原始圖片。關閉時，瀏覽器會在上傳時生成一張用於web發布的圖片。"
@@ -255,6 +259,8 @@ noMoreHistory: "沒有更多歷史紀錄"
 startMessaging: "開始聊天"
 nUsersRead: "{n}人已讀"
 agreeTo: "我同意{0}"
+agreeBelow: "同意以下內容"
+basicNotesBeforeCreateAccount: "基本注意事項"
 tos: "使用條款"
 start: "開始"
 home: "首頁"
@@ -324,16 +330,16 @@ integration: "整合"
 connectService: "己連結"
 disconnectService: "己斷開 "
 enableLocalTimeline: "開啟本地時間軸"
-enableGlobalTimeline: "啟用公開時間軸"
-disablingTimelinesInfo: "為了方便，即使您關閉了時間線功能，管理員和審核員仍可以繼續使用。"
+enableGlobalTimeline: "啟用全域時間軸"
+disablingTimelinesInfo: "為了方便，即使您關閉了時間線功能，管理員和審查員仍可以繼續使用。"
 registration: "註冊"
 enableRegistration: "開啟新使用者註冊"
 invite: "邀請"
 driveCapacityPerLocalAccount: "每個本地用戶的雲端空間大小"
-driveCapacityPerRemoteAccount: "每個非本地用戶的雲端容量"
+driveCapacityPerRemoteAccount: "每個非本地用戶的雲端空間大小"
 inMb: "以Mbps為單位"
-iconUrl: "圖像URL"
-bannerUrl: "橫幅圖像URL"
+iconUrl: "圖標URL"
+bannerUrl: "橫幅圖片URL"
 backgroundImageUrl: "背景圖片的來源網址 "
 basicInfo: "基本資訊"
 pinnedUsers: "置頂用戶"
@@ -372,8 +378,8 @@ connectedTo: "您的帳戶已連接到以下社交帳戶"
 notesAndReplies: "貼文與回覆"
 withFiles: "附件"
 silence: "禁言"
-silenceConfirm: "確定要禁言此用戶嗎？"
-unsilence: "解除禁言"
+silenceConfirm: "確定要靜音此使用者嗎？"
+unsilence: "解除靜音"
 unsilenceConfirm: "確定要解除禁言嗎？"
 popularUsers: "熱門使用者"
 recentlyUpdatedUsers: "最近發文的使用者"
@@ -382,18 +388,15 @@ recentlyDiscoveredUsers: "最近發現的使用者"
 exploreUsersCount: "有{count}個使用者"
 exploreFediverse: "探索聯邦世界"
 popularTags: "熱門標籤"
-userList: "清單"
-about: "資訊"
+userList: "使用者清單"
+about: "關於"
 aboutMisskey: "關於 Misskey"
 administrator: "管理員"
 token: "權杖"
-twoStepAuthentication: "兩階段驗證"
-moderator: "審核員"
-moderation: "言論調節"
+moderator: "審查員"
+moderation: "審查"
 nUsersMentioned: "提到了{n}"
 securityKey: "安全金鑰"
-securityKeyName: "金鑰名稱"
-registerSecurityKey: "註冊安全金鑰"
 lastUsed: "上次使用"
 unregister: "註銷帳號"
 passwordLessLogin: "設置無密碼登入"
@@ -411,24 +414,15 @@ markAsReadAllTalkMessages: "標記所有訊息為已讀"
 help: "幫助"
 inputMessageHere: "在此輸入訊息"
 close: "關閉"
-group: "群組"
-groups: "群組"
-createGroup: "創建群組"
-ownedGroups: "擁有的群組"
-joinedGroups: "群組成員"
 invites: "邀請"
-groupName: "群組名稱"
 members: "成員"
 transfer: "轉讓"
-messagingWithUser: "傳送訊息給其他使用者"
-messagingWithGroup: "發送訊息至群組"
 title: "標題"
 text: "文字"
 enable: "啟用"
 next: "下一步"
-retype: "重新輸入"
+retype: "再次輸入"
 noteOf: "{user}的貼文"
-inviteToGroup: "邀請至群組"
 quoteAttached: "引用"
 quoteQuestion: "是否要引用？"
 noMessagesYet: "沒有訊息"
@@ -450,20 +444,17 @@ passwordMatched: "密碼一致"
 passwordNotMatched: "密碼不一致"
 signinWith: "以{x}登錄"
 signinFailed: "登入失敗。 請檢查使用者名稱和密碼。"
-tapSecurityKey: "點擊安全密鑰"
 or: "或者"
 language: "語言"
 uiLanguage: "介面語言"
-groupInvited: "您有新的群組邀請"
 aboutX: "關於{x}"
 emojiStyle: "表情符號的風格"
 native: "原生"
 disableDrawer: "不顯示下拉式選單"
-youHaveNoGroups: "找不到群組"
-joinOrCreateGroup: "請加入現有群組，或創建新群組。"
 noHistory: "沒有歷史紀錄"
 signinHistory: "登入歷史"
-disableAnimatedMfm: "禁用MFM動畫"
+enableAdvancedMfm: "啟用高級MFM"
+enableAnimatedMfm: "啟用MFM動畫"
 doing: "正在進行"
 category: "類別"
 tags: "標籤"
@@ -472,7 +463,7 @@ createAccount: "建立帳戶"
 existingAccount: "現有帳戶"
 regenerate: "再生"
 fontSize: "字體大小"
-noFollowRequests: "沒有要求跟隨您的申請"
+noFollowRequests: "沒有跟隨您的請求"
 openImageInNewTab: "於新分頁中開啟圖片"
 dashboard: "儀表板"
 local: "本地"
@@ -529,8 +520,8 @@ installedDate: "安裝時間"
 lastUsedDate: "最後上線日期"
 state: "狀態"
 sort: "排序"
-ascendingOrder: "昇冪"
-descendingOrder: "降冪"
+ascendingOrder: "遞增"
+descendingOrder: "遞減"
 scratchpad: "暫存記憶體"
 scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Misskey互動的结果。"
 output: "輸出"
@@ -606,7 +597,7 @@ testEmail: "測試郵件發送"
 wordMute: "被靜音的文字"
 regexpError: "正規表達式錯誤"
 regexpErrorDescription: "{tab} 靜音文字的第 {line} 行的正規表達式有錯誤："
-instanceMute: "實例的靜音"
+instanceMute: "被靜音的實例"
 userSaysSomething: "{name}說了什麼"
 makeActive: "啟用"
 display: "檢視"
@@ -668,8 +659,8 @@ repliedCount: "回覆數量"
 renotedCount: "轉發次數"
 followingCount: "正在跟隨的用戶數量"
 followersCount: "跟隨者數量"
-sentReactionsCount: "情感發送次數"
-receivedReactionsCount: "情感收到次數"
+sentReactionsCount: "反應發送次數"
+receivedReactionsCount: "收到反應次數"
 pollVotesCount: "已統計的投票數"
 pollVotedCount: "已投票數"
 yes: "確定"
@@ -833,8 +824,6 @@ deleteAccountConfirm: "將要刪除帳戶。是否確定？"
 incorrectPassword: "密碼錯誤。"
 voteConfirm: "確定投給「{choice}」？"
 hide: "隱藏"
-leaveGroup: "離開群組"
-leaveGroupConfirm: "確定離開「{name}」？"
 useDrawerReactionPickerForMobile: "在移動設備上使用抽屜顯示"
 welcomeBackWithName: "歡迎回來，{name}"
 clickToFinishEmailVerification: "點擊 [{ok}] 完成電子郵件地址認證。"
@@ -860,6 +849,8 @@ failedToFetchAccountInformation: "取得帳戶資訊失敗"
 rateLimitExceeded: "已超過速率限制"
 cropImage: "圖片裁剪"
 cropImageAsk: "要剪裁圖片嗎？"
+cropYes: "裁剪"
+cropNo: "使用原圖"
 file: "檔案"
 recentNHours: "過去{n}小時"
 recentNDays: "過去{n}天"
@@ -869,7 +860,7 @@ recommended: "推薦"
 check: "檢查"
 driveCapOverrideLabel: "更改這個使用者的雲端硬碟容量上限"
 driveCapOverrideCaption: "如果指定0以下的值，就會被取消。"
-requireAdminForView: "必須以管理者帳號登入才可以檢視。"
+requireAdminForView: "必須以管理員帳號登入才可以檢視。"
 isSystemAccount: "由系統自動建立與管理的帳號。"
 typeToConfirm: "要執行這項操作，請輸入 {x} "
 deleteAccount: "刪除帳號"
@@ -931,31 +922,321 @@ undefined: "未定義"
 assign: "指派"
 unassign: "取消指派"
 color: "顏色"
+manageCustomEmojis: "管理自訂表情符號"
+youCannotCreateAnymore: "您無法再建立更多了。"
+cannotPerformTemporary: "暫時無法進行"
+cannotPerformTemporaryDescription: "由於超過操作次數限制，暫時無法進行。請過一段時間之後再嘗試。"
+preset: "預設值"
+selectFromPresets: "從預設值中選擇"
+achievements: "成就"
+gotInvalidResponseError: "伺服器的回應無效"
+gotInvalidResponseErrorDescription: "伺服器可能已關閉或者在維護中，請稍後再試。"
+thisPostMayBeAnnoying: "這篇貼文可能會造成別人的困擾。"
+thisPostMayBeAnnoyingHome: "發布到首頁"
+thisPostMayBeAnnoyingCancel: "退出"
+thisPostMayBeAnnoyingIgnore: "直接發布貼文"
+collapseRenotes: "省略顯示已看過的轉發貼文"
+internalServerError: "內部伺服器錯誤"
+internalServerErrorDescription: "內部伺服器發生了非預期的錯誤。"
+copyErrorInfo: "複製錯誤資訊"
+_achievements:
+  earnedAt: "獲得日期"
+  _types:
+    _notes1:
+      title: "just setting up my msky"
+      description: "發出了第一則貼文"
+      flavor: "祝您的Misskey生活愉快！"
+    _notes10:
+      title: "若干貼文"
+      description: "發表了10則貼文"
+    _notes100:
+      title: "許多貼文"
+      description: "發表了100則貼文"
+    _notes500:
+      title: "滿滿的貼文"
+      description: "發表了500則貼文"
+    _notes1000:
+      title: "堆積如山的貼文"
+      description: "發表了1000則貼文"
+    _notes5000:
+      title: "滔滔不絕的貼文"
+      description: "發表了5000則貼文"
+    _notes10000:
+      title: "超級貼文"
+      description: "發表了10000則貼文"
+    _notes20000:
+      title: "需要更多的貼文"
+      description: "發表了20000則貼文"
+    _notes30000:
+      title: "貼文貼文貼文"
+      description: "發表了30000則貼文"
+    _notes40000:
+      title: "貼文工廠"
+      description: "發表了40000則貼文"
+    _notes50000:
+      title: "貼文星球"
+      description: "發表了50000則貼文"
+    _notes60000:
+      title: "貼文類星體"
+      description: "發表了60000則貼文"
+    _notes70000:
+      title: "貼文黑洞"
+      description: "發表了70000則貼文"
+    _notes80000:
+      title: "貼文銀河"
+      description: "發表了80000則貼文"
+    _notes90000:
+      title: "貼文宇宙"
+      description: "發表了90000則貼文"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "發表了100,000則貼文"
+      flavor: "有這麼多東西要寫嗎？"
+    _login3:
+      title: "初學者Ⅰ"
+      description: "總登入天數為3天"
+      flavor: "從今天開始，我就是Misskist"
+    _login7:
+      title: "初學者ⅠⅠ"
+      description: "總登入天數為7天"
+      flavor: "您開始習慣了嗎？"
+    _login15:
+      title: "初學者ⅠⅠⅠ"
+      description: "總登入天數為15天"
+    _login30:
+      title: "Misskist Ⅰ"
+      description: "總登入天數為30天"
+    _login60:
+      title: "Misskist ⅠⅠ"
+      description: "總登入天數為60天"
+    _login100:
+      title: "Misskist ⅠⅠⅠ"
+      description: "總登入天數為100天"
+      flavor: "辣個 Misskist 用戶"
+    _login200:
+      title: "普通Ⅰ"
+      description: "總登入天數為200天"
+    _login300:
+      title: "普通IⅠ"
+      description: "總登入天數為300天"
+    _login400:
+      title: "普通IIⅠ"
+      description: "總登入天數為400天"
+    _login500:
+      title: "老兵Ⅰ"
+      description: "總登入天數為500天"
+      flavor: "諸君，我喜歡貼文"
+    _login600:
+      title: "老兵ⅠⅠ"
+      description: "總登入天數為600天"
+    _login700:
+      title: "老兵ⅠⅠⅠ"
+      description: "總登入天數為700天"
+    _login800:
+      title: "貼文大師Ⅰ"
+      description: "總登入天數為800天"
+    _login900:
+      title: "貼文大師ⅠⅠ"
+      description: "總登入天數為900天"
+    _login1000:
+      title: "貼文大師ⅠⅠⅠ"
+      description: "總登入天數為1,000天"
+      flavor: "感謝您使用Misskey！"
+    _noteClipped1:
+      title: "忍不住要收進摘錄裡"
+      description: "第一次將貼文收進摘錄"
+    _noteFavorited1:
+      title: "觀星者"
+      description: "第一次將貼文收藏至我的最愛"
+    _myNoteFavorited1:
+      title: "想要星星"
+      description: "自己的貼文被他人收藏至「我的最愛」了"
+    _profileFilled:
+      title: "有備而來"
+      description: "設定了個人檔案"
+    _markedAsCat:
+      title: "我是貓"
+      description: "已將帳戶設定為貓"
+      flavor: "還沒有名字。"
+    _following1:
+      title: "首次追隨"
+      description: "首次追隨了"
+    _following10:
+      title: "跟著跟著"
+      description: "跟隨超過10人了"
+    _following50:
+      title: "朋友很多"
+      description: "跟隨超過50人了"
+    _following100:
+      title: "100位朋友"
+      description: "跟隨超過100人了"
+    _following300:
+      title: "朋友過多"
+      description: "跟隨超過300人了"
+    _followers1:
+      title: "第一個追隨者"
+      description: "第一次被追隨"
+    _followers10:
+      title: "Follow me!"
+      description: "跟隨者超過10人了"
+    _followers50:
+      title: "成群結隊"
+      description: "跟隨者超過50人了"
+    _followers100:
+      title: "紅人"
+      description: "跟隨者超過100人了"
+    _followers300:
+      title: "請排成一排"
+      description: "跟隨者超過300人了"
+    _followers500:
+      title: "基地台"
+      description: "超過500名追隨者了"
+    _followers1000:
+      title: "影響者"
+      description: "超過1000名追隨者了"
+    _collectAchievements30:
+      title: "成就收藏家"
+      description: "獲得30個以上的成就"
+    _viewAchievements3min:
+      title: "喜愛成就"
+      description: "看成就列表要花3分鐘以上"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "發布「I ❤ #Misskey」"
+      flavor: "感謝您使用Misskey！ by 開發團隊"
+    _foundTreasure:
+      title: "尋寶"
+      description: "發現了隱藏的寶藏"
+    _client30min:
+      title: "休息一下"
+      description: "用戶端啟動已超過30分鐘"
+    _noteDeletedWithin1min:
+      title: "現在沒有了"
+      description: "發文後1分鐘內刪文"
+    _postedAtLateNight:
+      title: "夜行性"
+      description: "在深夜發佈貼文"
+      flavor: "該去睡覺了。"
+    _postedAt0min0sec:
+      title: "報時"
+      description: "在0分0秒發佈貼文"
+      flavor: "啵．啵．啵．嗶ー"
+    _selfQuote:
+      title: "自我引用"
+      description: "引用了自己的貼文"
+    _htl20npm:
+      title: "流動的TL"
+      description: "在首頁時間軸的流速超過20npm"
+    _viewInstanceChart:
+      title: "分析師"
+      description: "顯示了實例的圖表"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello world!"
+      description: "在暫存記憶體輸出了 hello world"
+    _open3windows:
+      title: "多重視窗"
+      description: "開啟了3個以上的視窗"
+    _driveFolderCircularReference:
+      title: "循環引用"
+      description: "試圖遞迴套入雲端硬碟資料夾"
+    _reactWithoutRead:
+      title: "有好好讀過嗎？"
+      description: "對包含100字以上內容的貼文做出情感反應"
+    _clickedClickHere:
+      title: "點擊這裡"
+      description: "已點擊這裡了"
+    _justPlainLucky:
+      title: "只是運氣好"
+      description: "每10秒有0.01%的機率獲得"
+    _setNameToSyuilo:
+      title: "神的情結"
+      description: "將名稱設定為 syuilo"
+    _passedSinceAccountCreated1:
+      title: "一周年"
+      description: "自建立帳戶開始過了1年"
+    _passedSinceAccountCreated2:
+      title: "二周年"
+      description: "自建立帳戶開始過了2年"
+    _passedSinceAccountCreated3:
+      title: "三周年"
+      description: "自建立帳戶開始過了3年"
+    _loggedInOnBirthday:
+      title: "生日快樂"
+      description: "在生日當天登入了"
+    _loggedInOnNewYearsDay:
+      title: "新年快樂"
+      description: "在元旦當天登入了"
+      flavor: "今年也請對敝實例多多指教"
+    _cookieClicked:
+      title: "點擊餅乾的遊戲"
+      description: "點擊了餅乾"
+      flavor: "是不是軟體有問題？"
+    _brainDiver:
+      title: "Brain Driver"
+      description: "發佈了Brain Driver的連結"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "建立角色"
   edit: "編輯角色"
   name: "角色名稱"
   description: "角色描述 "
   permission: "角色的權限"
-  descriptionOfPermission: "<b>審核員</b>執行與審核相關的基本操作。\n<b>管理者</b>能變更實例的全部設定。"
+  descriptionOfPermission: "<b>審查員</b>執行與審查相關的基本操作。\n<b>管理員</b>能變更實例的全部設定"
   assignTarget: "指派目標"
+  descriptionOfAssignTarget: "<b>手動</b>是以手動管理這個角色包含的人員。\n<b>符合條件</b>是設定條件以自動包含符合條件的使用者。"
   manual: "手動"
+  conditional: "符合條件"
   condition: "條件"
   isConditionalRole: "這是條件角色。"
   isPublic: "角色為公開"
+  descriptionOfIsPublic: "任何人都可以看到被指派了角色的使用者。此外，使用者的個人檔案將顯示這個角色。"
   options: "選項"
+  policies: "政策"
   baseRole: "基本角色"
   useBaseValue: "使用基本角色的值"
   chooseRoleToAssign: "選擇要指派的角色"
+  iconUrl: "圖示的URL"
+  asBadge: "顯示為徽章"
+  descriptionOfAsBadge: "開啟的話，角色圖示會顯示在用戶名旁邊。"
+  canEditMembersByModerator: "允許編輯審查員的成員"
+  descriptionOfCanEditMembersByModerator: "如果開啟，管理員與審查員都可以為使用者指派/解除指派該角色。如果關閉，則只有管理員可以執行。"
+  priority: "優先級"
+  _priority:
+    low: "低"
+    middle: "中"
+    high: "高"
   _options:
+    gtlAvailable: "瀏覽全域時間軸"
+    ltlAvailable: "瀏覽本地時間軸"
+    canPublicNote: "允許公開貼文"
+    canInvite: "發行實例邀請碼"
+    canManageCustomEmojis: "管理自訂表情符號"
     driveCapacity: "雲端硬碟容量"
+    pinMax: "置頂貼文的最大數量"
+    antennaMax: "可建立的天線數量"
+    wordMuteMax: "靜音文字的最大字數"
+    webhookMax: "可建立的Webhook數量"
+    clipMax: "可建立的摘錄數量"
+    noteEachClipsMax: "摘錄內貼文的最大數量"
+    userListMax: "可建立的使用者清單數量"
+    userEachUserListsMax: "使用者清單內使用者的最大數量"
+    rateLimitFactor: "速率限制"
+    descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
+    canHideAds: "不顯示廣告"
   _condition:
     isLocal: "本地使用者"
     isRemote: "遠端使用者"
     createdLessThan: "自建立帳戶開始～以內"
     createdMoreThan: "自建立帳戶開始～經過"
+    followersLessThanOrEq: "追隨者人數在～以下"
+    followersMoreThanOrEq: "追隨者人數在～以上"
+    followingLessThanOrEq: "追隨人數在～以下"
+    followingMoreThanOrEq: "追隨人數在～以上"
+    and: "～和～"
+    or: "～或～"
+    not: "～否"
 _sensitiveMediaDetection:
-  description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。"
+  description: "您可以使用機器學習自動檢測敏感媒體並將其用於審查。 伺服器的負荷會稍微增加。"
   sensitivity: "檢測敏感度"
   sensitivityDescription: "敏感度低時，誤檢測（偽陽性）會減少。敏感度高時，漏檢（偽陰性）會減少。"
   setSensitiveFlagAutomatically: "設定 NSFW 旗標"
@@ -986,6 +1267,7 @@ _accountDelete:
 _ad:
   back: "返回"
   reduceFrequencyOfThisAd: "降低此廣告的頻率 "
+  hide: "隱藏"
 _forgotPassword:
   enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
   ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
@@ -1041,72 +1323,6 @@ _nsfw:
   respect: "隱藏敏感內容"
   ignore: "不隱藏敏感內容"
   force: "隱藏所有內容"
-_mfm:
-  cheatSheet: "MFM代碼小抄"
-  intro: "MFM是Misskey專用的標記語言，可以在Misskey中的各個位置使用。 您可以這裏看到MFM可用語法列表。"
-  dummy: "Misskey拓展了Fediverse的世界"
-  mention: "提及"
-  mentionDescription: "透過 @+用戶名 來標示特定使用者。"
-  hashtag: "#tag"
-  hashtagDescription: "可以使用\"#\"符號後加文字表示話題標籤。"
-  url: "URL"
-  urlDescription: "可以展示URL位址。"
-  link: "鏈接"
-  linkDescription: "您可以將特定範圍的文章與 URL 相關聯。 "
-  bold: "粗體"
-  boldDescription: "可以將文字顯示为粗體来強調。"
-  small: "縮小"
-  smallDescription: "可以使內容文字變小、變淡。"
-  center: "置中"
-  centerDescription: "可以將內容置中顯示。"
-  inlineCode: "程式碼(内嵌)"
-  inlineCodeDescription: "在行內用高亮度顯示，例如程式碼語法。"
-  blockCode: "程式碼(區塊)"
-  blockCodeDescription: "在區塊中用高亮度顯示，例如複數行的程式碼語法。"
-  inlineMath: "數學公式(內嵌)"
-  inlineMathDescription: "顯示內嵌的KaTex數學公式。"
-  blockMath: "數學公式(方塊)"
-  blockMathDescription: "以區塊顯示複數行的KaTex數學式。"
-  quote: "引用"
-  quoteDescription: "可以用來表示引用的内容。"
-  emoji: "自訂表情符號"
-  emojiDescription: "您可以通過將自定義表情符號名稱括在冒號中來顯示自定義表情符號。 "
-  search: "搜尋"
-  searchDescription: "您可以顯示所輸入的搜索框。"
-  flip: "翻轉"
-  flipDescription: "將內容上下或左右翻轉。"
-  jelly: "動畫(果凍)"
-  jellyDescription: "顯示果凍一樣的動畫效果。"
-  tada: "動畫（鏘～）"
-  tadaDescription: "顯示「鏘～！」這種感覺的動畫效果。"
-  jump: "動畫(跳動)"
-  jumpDescription: "顯示跳動的動畫效果。"
-  bounce: "動畫(反彈)"
-  bounceDescription: "顯示有彈性的動畫效果。"
-  shake: "動畫(搖晃)"
-  shakeDescription: "顯示顫抖的動畫效果。"
-  twitch: "動畫(顫抖)"
-  twitchDescription: "顯示強烈顫抖的動畫效果。"
-  spin: "動畫(旋轉)"
-  spinDescription: "顯示旋轉的動畫效果。"
-  x2: "大"
-  x2Description: "放大顯示內容。"
-  x3: "較大"
-  x3Description: "放大顯示內容。"
-  x4: "最大"
-  x4Description: "將顯示內容放至最大。"
-  blur: "模糊"
-  blurDescription: "產生模糊效果。将游標放在上面即可將内容顯示出來。"
-  font: "字型"
-  fontDescription: "您可以設定顯示內容的字型"
-  rainbow: "彩虹"
-  rainbowDescription: "用彩虹色來顯示內容。"
-  sparkle: "閃閃發光"
-  sparkleDescription: "添加閃閃發光的粒子效果。"
-  rotate: "旋轉"
-  rotateDescription: "以指定的角度旋轉。"
-  plain: "簡潔"
-  plainDescription: "停用全部的內部語法。"
 _instanceTicker:
   none: "隱藏"
   remote: "向遠端使用者顯示"
@@ -1259,7 +1475,7 @@ _tutorial:
   step5_3: "想要追隨其他人，只要點擊他們的大頭貼並按「追隨」即可。"
   step5_4: "如果使用者的名字旁有鎖頭的圖示，代表他們需要手動核准你的追隨請求。"
   step6_1: "現在你可以在時間軸上看到其他用戶的貼文。"
-  step6_2: "你也可以對別人的貼文作出「情感」，作出簡單的回覆。"
+  step6_2: "你也可以對別人的貼文作出「反應」，作出簡單的回覆。"
   step6_3: "在他人的貼文按下\"+\"圖標，即可選擇喜好的表情符號進行回應。"
   step7_1: "以上為Misskey的基本操作說明，教學在此告一段落。辛苦了。"
   step7_2: "歡迎到{help}來瞭解更多Misskey相關介紹。"
@@ -1269,14 +1485,14 @@ _tutorial:
   step8_3: "通知的設定可以在之後變更。"
 _2fa:
   alreadyRegistered: "此設備已經被註冊過了"
-  registerDevice: "註冊裝置"
-  registerKey: "註冊鍵"
   step1: "首先，在您的設備上安裝二步驗證程式，例如{a}或{b}。"
   step2: "然後，掃描螢幕上的QR code。"
   step2Url: "在桌面版應用中，請輸入以下的URL："
   step3: "輸入您的App提供的權杖以完成設定。"
   step4: "從現在開始，任何登入操作都將要求您提供權杖。"
   securityKeyInfo: "您可以設定使用支援FIDO2的硬體安全鎖、終端設備的指纹認證或者PIN碼來登入。"
+  removeKeyConfirm: "要刪除{name}嗎？"
+  renewTOTPCancel: "現在不要"
 _permissions:
   "read:account": "查看我的帳戶資訊"
   "write:account": "更改我的帳戶資訊"
@@ -1295,8 +1511,8 @@ _permissions:
   "write:notes": "撰寫或刪除貼文"
   "read:notifications": "查看通知"
   "write:notifications": "編輯通知"
-  "read:reactions": "查看情感"
-  "write:reactions": "編輯情感"
+  "read:reactions": "查看反應"
+  "write:reactions": "編輯反應"
   "write:votes": "投票"
   "read:pages": "顯示頁面"
   "write:pages": "編輯頁面"
@@ -1311,18 +1527,20 @@ _permissions:
   "read:gallery-likes": "讀取喜歡的圖片"
   "write:gallery-likes": "操作喜歡的圖片"
 _auth:
+  shareAccessTitle: "應用程式的存取權限"
   shareAccess: "要授權「“{name}”」存取您的帳戶嗎？"
   shareAccessAsk: "您確定要授權這個應用程式使用您的帳戶嗎？"
+  permission: "{name}要求以下的權限"
   permissionAsk: "此應用程式需要以下權限"
   pleaseGoBack: "請返回至應用程式"
   callback: "回到應用程式"
   denied: "拒絕訪問"
+  pleaseLogin: "必須登入以提供應用程式的存取權限。"
 _antennaSources:
   all: "全部貼文"
   homeTimeline: "來自已追隨使用者的貼文"
   users: "來自特定使用者的貼文"
   userList: "來自特定清單中的貼文"
-  userGroup: "來自特定群組的貼文"
 _weekday:
   sunday: "週日"
   monday: "週一"
@@ -1397,8 +1615,6 @@ _visibility:
   followersDescription: "僅發送至關注者"
   specified: "指定使用者"
   specifiedDescription: "僅發送至指定使用者"
-  localOnly: "僅限本地"
-  localOnlyDescription: "對遠端使用者隱藏"
 _postForm:
   replyPlaceholder: "回覆此貼文..."
   quotePlaceholder: "引用此貼文..."
@@ -1536,15 +1752,13 @@ _notification:
   youGotReply: "{name}回覆了您"
   youGotQuote: "{name}引用了您"
   youRenoted: "{name} 轉發了你的貼文"
-  youGotMessagingMessageFromUser: "{name}發送給您的訊息"
-  youGotMessagingMessageFromGroup: "{name}發送給您的訊息"
   youWereFollowed: "您有新的追隨者"
   youReceivedFollowRequest: "您有新的追隨請求"
   yourFollowRequestAccepted: "您的追隨請求已通過"
-  youWereInvitedToGroup: "您有新的群組邀請"
   pollEnded: "問卷調查已產生結果"
   unreadAntennaNote: "天線 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
+  achievementEarned: "獲得成就"
   _types:
     all: "全部 "
     follow: "追隨中"
@@ -1556,7 +1770,6 @@ _notification:
     pollEnded: "問卷調查結束"
     receiveFollowRequest: "已收到追隨請求"
     followRequestAccepted: "追隨請求已接受"
-    groupInvited: "加入社群邀請"
     app: "應用程式通知"
   _actions:
     followBack: "回關"
@@ -1586,5 +1799,6 @@ _deck:
     tl: "時間軸"
     antenna: "天線"
     list: "清單"
+    channel: "頻道"
     mentions: "提及"
     direct: "指定使用者"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "13.0.0-rc.2",
-	"codename": "indigo",
+	"version": "13.7.5",
+	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "yarn@3.3.0",
+	"packageManager": "pnpm@7.27.0",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -15,31 +15,31 @@
 	"private": true,
 	"scripts": {
 		"build-pre": "node ./scripts/build-pre.js",
-		"build": "yarn build-pre && yarn workspaces foreach run build && yarn run gulp",
+		"build": "pnpm build-pre && pnpm -r build && pnpm gulp",
 		"start": "cd packages/backend && node ./built/boot/index.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/index.js",
-		"init": "yarn migrate",
-		"migrate": "cd packages/backend && yarn run typeorm migration:run -d ormconfig.js",
-		"migrateandstart": "yarn migrate && yarn start",
-		"gulp": "gulp build",
-		"watch": "yarn dev",
+		"init": "pnpm migrate",
+		"migrate": "cd packages/backend && pnpm migrate",
+		"migrateandstart": "pnpm migrate && pnpm start",
+		"gulp": "pnpm exec gulp build",
+		"watch": "pnpm dev",
 		"dev": "node ./scripts/dev.js",
-		"lint": "yarn workspaces foreach run lint",
-		"cy:open": "cypress open --browser --e2e --config-file=cypress.config.ts",
-		"cy:run": "cypress run",
-		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
-		"jest": "cd packages/backend && cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --runInBand",
-		"jest-and-coverage": "cd packages/backend && cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --runInBand",
-		"test": "yarn jest",
-		"test-and-coverage": "yarn jest-and-coverage",
-		"format": "gulp format",
+		"lint": "pnpm -r lint",
+		"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
+		"cy:run": "pnpm cypress run",
+		"e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run",
+		"jest": "cd packages/backend && pnpm jest",
+		"jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage",
+		"test": "pnpm jest",
+		"test-and-coverage": "pnpm jest-and-coverage",
+		"format": "pnpm exec gulp format",
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
-		"cleanall": "yarn clean-all"
+		"cleanall": "pnpm clean-all"
 	},
 	"resolutions": {
-		"chokidar": "^3.3.1",
-		"lodash": "^4.17.21"
+		"chokidar": "3.5.3",
+		"lodash": "4.17.21"
 	},
 	"dependencies": {
 		"execa": "5.1.1",
@@ -48,17 +48,20 @@
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.1.4",
 		"gulp-terser": "2.1.0",
-		"js-yaml": "4.1.0"
+		"js-yaml": "4.1.0",
+		"typescript": "4.9.5"
 	},
 	"devDependencies": {
 		"@types/gulp": "4.0.10",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "5.48.0",
-		"@typescript-eslint/parser": "5.48.0",
+		"@typescript-eslint/eslint-plugin": "5.52.0",
+		"@typescript-eslint/parser": "5.52.0",
 		"cross-env": "7.0.3",
-		"cypress": "12.3.0",
-		"eslint": "^8.31.0",
-		"start-server-and-test": "1.15.2",
-		"typescript": "4.9.4"
+		"cypress": "12.6.0",
+		"eslint": "8.34.0",
+		"start-server-and-test": "1.15.4"
+	},
+	"optionalDependencies": {
+		"@tensorflow/tfjs-core": "4.2.0"
 	}
 }

packages/backend/.swcrc

@@ -1,15 +1,23 @@
 {
-  "$schema": "https://json.schemastore.org/swcrc",
-  "jsc": {
-    "parser": {
-      "syntax": "typescript",
-      "dynamicImport": true,
-      "decorators": true
-    },
-    "transform": {
-      "legacyDecorator": true,
-      "decoratorMetadata": true
-    }
-  },
-  "minify": false
+	"$schema": "https://json.schemastore.org/swcrc",
+	"jsc": {
+		"parser": {
+			"syntax": "typescript",
+			"dynamicImport": true,
+			"decorators": true
+		},
+		"transform": {
+			"legacyDecorator": true,
+			"decoratorMetadata": true
+		},
+		"experimental": {
+			"keepImportAssertions": true
+		},
+		"baseUrl": "src",
+		"paths": {
+			"@/*": ["*"]
+		},
+		"target": "es2021"
+	},
+	"minify": false
 }

packages/backend/jest-resolver.cjs

@@ -1,14 +0,0 @@
-// https://github.com/facebook/jest/issues/12270#issuecomment-1194746382
-
-const nativeModule = require('node:module');
-
-function resolver(module, options) {
-  const { basedir, defaultResolver } = options;
-  try {
-    return defaultResolver(module, options);
-  } catch (error) {
-    return nativeModule.createRequire(basedir).resolve(module);
-  }
-}
-
-module.exports = resolver;

packages/backend/jest.config.cjs

@@ -83,7 +83,14 @@ module.exports = {
 
 	// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
 	moduleNameMapper: {
-		"^@/(.*?).js": "<rootDir>/src/$1.ts",
+		// Do not resolve .wasm.js to .wasm by the rule below
+		'^(.+)\\.wasm\\.js$': '$1.wasm.js',
+		// SWC converts @/foo/bar.js to `../../src/foo/bar.js`, and then this rule
+		// converts it again to `../../src/foo/bar` which then can be resolved to
+		// `.ts` files.
+		// See https://github.com/swc-project/jest/issues/64#issuecomment-1029753225
+		// TODO: Use `--allowImportingTsExtensions` on TypeScript 5.0 so that we can
+		// directly import `.ts` files without this hack.
 		'^(\\.{1,2}/.*)\\.js$': '$1',
 	},
 
@@ -112,7 +119,7 @@ module.exports = {
 	// resetModules: false,
 
 	// A path to a custom resolver
-	resolver: './jest-resolver.cjs',
+	// resolver: './jest-resolver.cjs',
 
 	// Automatically restore mock state between every test
 	restoreMocks: true,

packages/backend/migration/1673783015567-Policies.js

@@ -0,0 +1,13 @@
+export class Policies1673783015567 {
+    name = 'Policies1673783015567'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "role" RENAME COLUMN "options" TO "policies"`);
+				await queryRunner.query(`ALTER TABLE "meta" RENAME COLUMN "defaultRoleOverride" TO "policies"`);
+    }
+
+    async down(queryRunner) {
+				await queryRunner.query(`ALTER TABLE "meta" RENAME COLUMN "policies" TO "defaultRoleOverride"`);
+        await queryRunner.query(`ALTER TABLE "role" RENAME COLUMN "policies" TO "options"`);
+    }
+}

packages/backend/migration/1673812883772-firstRetrievedAt.js

@@ -0,0 +1,11 @@
+export class firstRetrievedAt1673812883772 {
+    name = 'firstRetrievedAt1673812883772'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" RENAME COLUMN "caughtAt" TO "firstRetrievedAt"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" RENAME COLUMN "firstRetrievedAt" TO "caughtAt"`);
+    }
+}

packages/backend/migration/1674086433654-flashScriptLength.js

@@ -0,0 +1,11 @@
+export class flashScriptLength1674086433654 {
+    name = 'flashScriptLength1674086433654'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "flash" ALTER COLUMN "script" TYPE character varying(32768)`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "flash" ALTER COLUMN "script" TYPE character varying(16384)`);
+    }
+}

packages/backend/migration/1674118260469-achievement.js

@@ -0,0 +1,33 @@
+export class achievement1674118260469 {
+    name = 'achievement1674118260469'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "notification" ADD "achievement" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "achievements" jsonb NOT NULL DEFAULT '[]'`);
+        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app')`);
+        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum" USING "type"::"text"::"public"."notification_type_enum"`);
+        await queryRunner.query(`DROP TYPE "public"."notification_type_enum_old"`);
+        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" RENAME TO "user_profile_mutingnotificationtypes_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum"[]`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
+        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum_old"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'pollEnded')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
+        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`);
+        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
+        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum_old" USING "type"::"text"::"public"."notification_type_enum_old"`);
+        await queryRunner.query(`DROP TYPE "public"."notification_type_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum_old" RENAME TO "notification_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "achievements"`);
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "achievement"`);
+    }
+}

packages/backend/migration/1674255666603-loggedInDates.js

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

packages/backend/migration/1675404035646-cleanup.js

@@ -0,0 +1,29 @@
+export class cleanup1675404035646 {
+    name = 'cleanup1675404035646'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableTwitterIntegration"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGithubIntegration"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableDiscordIntegration"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "twitterConsumerKey"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "twitterConsumerSecret"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "githubClientId"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "githubClientSecret"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "discordClientId"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "discordClientSecret"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "integrations"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "integrations" jsonb NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "discordClientSecret" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "discordClientId" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "githubClientSecret" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "githubClientId" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "twitterConsumerSecret" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "twitterConsumerKey" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableDiscordIntegration" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableGithubIntegration" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableTwitterIntegration" boolean NOT NULL DEFAULT false`);
+    }
+}

packages/backend/migration/1675557528704-role-icon-badge.js

@@ -0,0 +1,13 @@
+export class roleIconBadge1675557528704 {
+    name = 'roleIconBadge1675557528704'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "role" ADD "iconUrl" character varying(512)`);
+        await queryRunner.query(`ALTER TABLE "role" ADD "asBadge" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "asBadge"`);
+        await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "iconUrl"`);
+    }
+}

packages/backend/migration/1676434944993-drop-group.js

@@ -0,0 +1,27 @@
+export class dropGroup1676434944993 {
+    name = 'dropGroup1676434944993'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb"`);
+        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_8fe87814e978053a53b1beb7e98"`);
+        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "userGroupJoiningId"`);
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "userGroupInvitationId"`);
+        await queryRunner.query(`ALTER TYPE "public"."antenna_src_enum" RENAME TO "antenna_src_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."antenna_src_enum" AS ENUM('home', 'all', 'users', 'list')`);
+        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "public"."antenna_src_enum" USING "src"::"text"::"public"."antenna_src_enum"`);
+        await queryRunner.query(`DROP TYPE "public"."antenna_src_enum_old"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "emailNotificationTypes" SET DEFAULT '["follow","receiveFollowRequest"]'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "emailNotificationTypes" SET DEFAULT '["follow", "receiveFollowRequest", "groupInvited"]'`);
+        await queryRunner.query(`CREATE TYPE "public"."antenna_src_enum_old" AS ENUM('home', 'all', 'users', 'list', 'group')`);
+        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "public"."antenna_src_enum_old" USING "src"::"text"::"public"."antenna_src_enum_old"`);
+        await queryRunner.query(`DROP TYPE "public"."antenna_src_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."antenna_src_enum_old" RENAME TO "antenna_src_enum"`);
+        await queryRunner.query(`ALTER TABLE "notification" ADD "userGroupInvitationId" character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "antenna" ADD "userGroupJoiningId" character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_8fe87814e978053a53b1beb7e98" FOREIGN KEY ("userGroupInvitationId") REFERENCES "user_group_invitation"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "antenna" ADD CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb" FOREIGN KEY ("userGroupJoiningId") REFERENCES "user_group_joining"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+}

packages/backend/migration/1676438468213-ad3.js

@@ -0,0 +1,9 @@
+export class ad1676438468213 {
+	name = 'ad1676438468213';
+	async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "ad" ADD "startsAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()`);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "startsAt"`);
+	}
+}

packages/backend/ormconfig.js

@@ -1,6 +1,6 @@
 import { DataSource } from 'typeorm';
 import { loadConfig } from './built/config.js';
-import { entities } from './built/postgre.js';
+import { entities } from './built/postgres.js';
 
 const config = loadConfig();
 

packages/backend/package.json

@@ -6,45 +6,62 @@
 	"scripts": {
 		"start": "node ./built/index.js",
 		"start:test": "NODE_ENV=test node ./built/index.js",
-		"migrate": "typeorm migration:run -d ormconfig.js",
-		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
+		"migrate": "pnpm typeorm migration:run -d ormconfig.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",
-		"lint": "tsc --noEmit && eslint --quiet \"src/**/*.ts\"",
+		"typecheck": "tsc --noEmit",
+		"eslint": "eslint --quiet \"src/**/*.ts\"",
+		"lint": "pnpm typecheck && pnpm eslint",
 		"jest": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --runInBand",
 		"jest-and-coverage": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --runInBand",
 		"jest-clear": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --clearCache",
-		"test": "yarn jest",
-		"test-and-coverage": "yarn jest-and-coverage"
+		"test": "pnpm jest",
+		"test-and-coverage": "pnpm jest-and-coverage"
 	},
 	"optionalDependencies": {
-		"@tensorflow/tfjs": "^4.1.0",
-		"@tensorflow/tfjs-node": "4.1.0"
+		"@swc/core-android-arm64": "^1.3.11",
+		"@swc/core-darwin-arm64": "^1.3.36",
+		"@swc/core-darwin-x64": "^1.3.36",
+		"@swc/core-linux-arm-gnueabihf": "^1.3.36",
+		"@swc/core-linux-arm64-gnu": "^1.3.36",
+		"@swc/core-linux-arm64-musl": "^1.3.36",
+		"@swc/core-linux-x64-gnu": "^1.3.36",
+		"@swc/core-linux-x64-musl": "^1.3.36",
+		"@swc/core-win32-arm64-msvc": "^1.3.36",
+		"@swc/core-win32-ia32-msvc": "^1.3.36",
+		"@swc/core-win32-x64-msvc": "^1.3.36",
+		"@tensorflow/tfjs": "4.2.0",
+		"@tensorflow/tfjs-node": "4.2.0"
 	},
 	"dependencies": {
-		"@bull-board/api": "^4.10.1",
-		"@bull-board/fastify": "^4.10.1",
-		"@bull-board/ui": "^4.10.1",
+		"@bull-board/api": "4.12.1",
+		"@bull-board/fastify": "4.12.1",
+		"@bull-board/ui": "4.12.1",
 		"@discordapp/twemoji": "14.0.2",
 		"@fastify/accepts": "4.1.0",
-		"@fastify/cookie": "^8.3.0",
+		"@fastify/cookie": "8.3.0",
 		"@fastify/cors": "8.2.0",
-		"@fastify/http-proxy": "^8.4.0",
-		"@fastify/multipart": "7.3.0",
-		"@fastify/static": "6.6.0",
-		"@fastify/view": "7.3.0",
-		"@nestjs/common": "9.2.1",
-		"@nestjs/core": "9.2.1",
-		"@nestjs/testing": "9.2.1",
+		"@fastify/http-proxy": "8.4.0",
+		"@fastify/multipart": "7.4.1",
+		"@fastify/static": "6.9.0",
+		"@fastify/view": "7.4.1",
+		"@nestjs/common": "9.3.9",
+		"@nestjs/core": "9.3.9",
+		"@nestjs/testing": "9.3.9",
 		"@peertube/http-signature": "1.7.0",
 		"@sinonjs/fake-timers": "10.0.2",
-		"accepts": "^1.3.8",
+		"@swc/cli": "0.1.62",
+		"@swc/core": "1.3.35",
+		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "5.3.1",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1289.0",
+		"aws-sdk": "2.1318.0",
 		"bcryptjs": "2.4.3",
-		"blurhash": "2.0.4",
-		"bull": "4.10.2",
+		"blurhash": "2.0.5",
+		"bull": "4.10.4",
 		"cacheable-lookup": "6.1.0",
 		"cbor": "8.1.0",
 		"chalk": "5.2.0",
@@ -56,39 +73,41 @@
 		"date-fns": "2.29.3",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
-		"fastify": "4.11.0",
+		"fastify": "4.13.0",
 		"feed": "4.2.2",
-		"file-type": "18.0.0",
+		"file-type": "18.2.1",
 		"fluent-ffmpeg": "2.1.2",
-		"form-data": "^4.0.0",
+		"form-data": "4.0.0",
 		"got": "12.5.3",
+		"happy-dom": "^8.7.0",
 		"hpagent": "1.2.0",
 		"ioredis": "4.28.5",
-		"ip-cidr": "3.0.11",
+		"ip-cidr": "3.1.0",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
-		"jsdom": "20.0.3",
+		"jsdom": "21.1.0",
 		"json5": "2.2.3",
-		"json5-loader": "4.0.1",
 		"jsonld": "8.1.0",
 		"jsrsasign": "10.6.1",
 		"mfm-js": "0.23.3",
 		"mime-types": "2.1.35",
-		"misskey-js": "0.0.14",
+		"misskey-js": "0.0.15",
 		"ms": "3.0.0-canary.1",
 		"nested-property": "4.0.0",
-		"nodemailer": "6.8.0",
+		"node-fetch": "3.3.0",
+		"nodemailer": "6.9.1",
 		"nsfwjs": "2.4.2",
-		"oauth": "^0.10.0",
+		"oauth": "0.10.0",
 		"os-utils": "0.0.14",
+		"otpauth": "^9.0.2",
 		"parse5": "7.1.2",
-		"pg": "8.8.0",
+		"pg": "8.9.0",
 		"private-ip": "3.0.0",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
-		"punycode": "2.1.1",
-		"pureimage": "0.3.15",
+		"punycode": "2.3.0",
+		"pureimage": "0.3.17",
 		"qrcode": "1.5.1",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
@@ -100,53 +119,51 @@
 		"rss-parser": "3.12.0",
 		"rxjs": "7.8.0",
 		"s-age": "1.1.2",
-		"sanitize-html": "2.8.1",
-		"seedrandom": "^3.0.5",
+		"sanitize-html": "2.10.0",
+		"seedrandom": "3.0.5",
 		"semver": "7.3.8",
 		"sharp": "0.31.3",
-		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"summaly": "2.7.0",
-		"syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2",
-		"systeminformation": "5.17.1",
-		"tinycolor2": "1.5.2",
+		"summaly": "github:misskey-dev/summaly",
+		"systeminformation": "5.17.9",
+		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.2",
 		"tsconfig-paths": "4.1.2",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.11",
+		"typescript": "4.9.5",
 		"ulid": "2.3.0",
-		"undici": "^5.14.0",
 		"unzipper": "0.10.11",
 		"uuid": "9.0.0",
 		"vary": "1.1.2",
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
-		"ws": "8.11.0",
+		"ws": "8.12.1",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.117",
-		"@swc/core": "1.3.25",
+		"@jest/globals": "29.4.3",
+		"@redocly/openapi-core": "1.0.0-beta.123",
 		"@swc/jest": "0.2.24",
 		"@types/accepts": "1.3.5",
 		"@types/archiver": "5.3.1",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "4.10.0",
 		"@types/cbor": "6.0.0",
-		"@types/color-convert": "^2.0.0",
-		"@types/content-disposition": "^0.5.5",
+		"@types/color-convert": "2.0.0",
+		"@types/content-disposition": "0.5.5",
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@types/ioredis": "4.28.10",
-		"@types/jest": "29.2.5",
+		"@types/jest": "29.4.0",
 		"@types/js-yaml": "4.0.5",
-		"@types/jsdom": "20.0.1",
+		"@types/jsdom": "21.1.0",
 		"@types/jsonld": "1.5.8",
-		"@types/jsrsasign": "10.5.4",
+		"@types/jsrsasign": "10.5.5",
 		"@types/mime-types": "2.1.1",
-		"@types/node": "18.11.18",
+		"@types/node": "18.14.0",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.7",
 		"@types/oauth": "0.9.1",
@@ -162,8 +179,6 @@
 		"@types/semver": "7.3.13",
 		"@types/sharp": "0.31.1",
 		"@types/sinonjs__fake-timers": "8.1.2",
-		"@types/speakeasy": "2.0.7",
-		"@types/syslog-pro": "^1.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/tmp": "0.2.3",
 		"@types/unzipper": "0.10.5",
@@ -172,15 +187,13 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.4",
-		"@typescript-eslint/eslint-plugin": "5.48.0",
-		"@typescript-eslint/parser": "5.48.0",
+		"@typescript-eslint/eslint-plugin": "5.52.0",
+		"@typescript-eslint/parser": "5.52.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.31.0",
-		"eslint-plugin-import": "2.26.0",
+		"eslint": "8.34.0",
+		"eslint-plugin-import": "2.27.5",
 		"execa": "6.1.0",
-		"jest": "29.3.1",
-		"jest-mock": "^29.3.1",
-		"node-fetch": "3.3.0",
-		"typescript": "4.9.4"
+		"jest": "29.4.3",
+		"jest-mock": "29.4.3"
 	}
-}
+}

packages/backend/src/@types/redis-lock.d.ts

@@ -0,0 +1,8 @@
+declare module 'redis-lock' {
+	import type Redis from 'ioredis';
+
+	type Lock = (lockName: string, timeout?: number, taskToPerform?: () => Promise<void>) => void;
+	function redisLock(client: Redis.Redis, retryDelay: number): Lock;
+
+	export = redisLock;
+}

packages/backend/src/GlobalModule.ts

@@ -4,7 +4,7 @@ import { DataSource } from 'typeorm';
 import { createRedisConnection } from '@/redis.js';
 import { DI } from './di-symbols.js';
 import { loadConfig } from './config.js';
-import { createPostgreDataSource } from './postgre.js';
+import { createPostgresDataSource } from './postgres.js';
 import { RepositoryModule } from './models/RepositoryModule.js';
 import type { Provider, OnApplicationShutdown } from '@nestjs/common';
 
@@ -18,7 +18,7 @@ const $config: Provider = {
 const $db: Provider = {
 	provide: DI.db,
 	useFactory: async (config) => {
-		const db = createPostgreDataSource(config);
+		const db = createPostgresDataSource(config);
 		return await db.initialize();
 	},
 	inject: [DI.config],

packages/backend/src/MainModule.ts

@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
 import { ServerModule } from '@/server/ServerModule.js';
 import { GlobalModule } from '@/GlobalModule.js';
-import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
+import { DaemonModule } from '@/daemons/DaemonModule.js';
 
 @Module({
 	imports: [
 		GlobalModule,
 		ServerModule,
-		QueueProcessorModule,
+		DaemonModule,
 	],
 })
-export class RootModule {}
+export class MainModule {}

packages/backend/src/boot/common.ts

@@ -0,0 +1,35 @@
+import { NestFactory } from '@nestjs/core';
+import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
+import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
+import { NestLogger } from '@/NestLogger.js';
+import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
+import { JanitorService } from '@/daemons/JanitorService.js';
+import { QueueStatsService } from '@/daemons/QueueStatsService.js';
+import { ServerStatsService } from '@/daemons/ServerStatsService.js';
+import { ServerService } from '@/server/ServerService.js';
+import { MainModule } from '@/MainModule.js';
+
+export async function server() {
+	const app = await NestFactory.createApplicationContext(MainModule, {
+		logger: new NestLogger(),
+	});
+	app.enableShutdownHooks();
+
+	const serverService = app.get(ServerService);
+	serverService.launch();
+
+	app.get(ChartManagementService).start();
+	app.get(JanitorService).start();
+	app.get(QueueStatsService).start();
+	app.get(ServerStatsService).start();
+}
+
+export async function jobQueue() {
+	const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
+		logger: new NestLogger(),
+	});
+	jobQueue.enableShutdownHooks();
+
+	jobQueue.get(QueueProcessorService).start();
+	jobQueue.get(ChartManagementService).start();
+}

packages/backend/src/boot/master.ts

@@ -6,18 +6,12 @@ import cluster from 'node:cluster';
 import chalk from 'chalk';
 import chalkTemplate from 'chalk-template';
 import semver from 'semver';
-import { NestFactory } from '@nestjs/core';
 import Logger from '@/logger.js';
 import { loadConfig } from '@/config.js';
 import type { Config } from '@/config.js';
-import { lessThan } from '@/misc/prelude/array.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
-import { DaemonModule } from '@/daemons/DaemonModule.js';
-import { JanitorService } from '@/daemons/JanitorService.js';
-import { QueueStatsService } from '@/daemons/QueueStatsService.js';
-import { ServerStatsService } from '@/daemons/ServerStatsService.js';
-import { NestLogger } from '@/NestLogger.js';
-import { envOption } from '../env.js';
+import { envOption } from '@/env.js';
+import { jobQueue, server } from './common.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -70,6 +64,14 @@ export async function masterMain() {
 		process.exit(1);
 	}
 
+	if (envOption.onlyServer) {
+		await server();
+	} else if (envOption.onlyQueue) {
+		await jobQueue();
+	} else {
+		await server();
+	}
+
 	bootLogger.succ('Misskey initialized');
 
 	if (!envOption.disableClustering) {
@@ -77,16 +79,6 @@ export async function masterMain() {
 	}
 
 	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
-
-	if (!envOption.noDaemons) {
-		const daemons = await NestFactory.createApplicationContext(DaemonModule, {
-			logger: new NestLogger(),
-		});
-		daemons.enableShutdownHooks();
-		daemons.get(JanitorService).start();
-		daemons.get(QueueStatsService).start();
-		daemons.get(ServerStatsService).start();
-	}
 }
 
 function showEnvironment(): void {

packages/backend/src/boot/worker.ts

@@ -1,33 +1,19 @@
 import cluster from 'node:cluster';
-import { NestFactory } from '@nestjs/core';
 import { envOption } from '@/env.js';
-import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
-import { ServerService } from '@/server/ServerService.js';
-import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
-import { NestLogger } from '@/NestLogger.js';
-import { RootModule } from '../RootModule.js';
+import { jobQueue, server } from './common.js';
 
 /**
  * Init worker process
  */
 export async function workerMain() {
-	const app = await NestFactory.createApplicationContext(RootModule, {
-		logger: new NestLogger(),
-	});
-	app.enableShutdownHooks();
-
-	// start server
-	const serverService = app.get(ServerService);
-	serverService.launch();
-
-	// start job queue
-	if (!envOption.onlyServer) {
-		const queueProcessorService = app.get(QueueProcessorService);
-		queueProcessorService.start();
+	if (envOption.onlyServer) {
+		await server();
+	} else if (envOption.onlyQueue) {
+		await jobQueue();
+	} else {
+		await jobQueue();
 	}
 
-	app.get(ChartManagementService).run();
-
 	if (cluster.isWorker) {
 		// Send a 'ready' message to parent process
 		process.send!('ready');

packages/backend/src/config.ts

@@ -65,13 +65,9 @@ export type Source = {
 	deliverJobMaxAttempts?: number;
 	inboxJobMaxAttempts?: number;
 
-	syslog: {
-		host: string;
-		port: number;
-	};
-
 	mediaProxy?: string;
 	proxyRemoteFiles?: boolean;
+	videoThumbnailGenerator?: string;
 
 	signToActivityPubGet?: boolean;
 };
@@ -92,6 +88,9 @@ export type Mixin = {
 	userAgent: string;
 	clientEntry: string;
 	clientManifestExists: boolean;
+	mediaProxy: string;
+	externalMediaProxyEnabled: boolean;
+	videoThumbnailGenerator: string | null;
 };
 
 export type Config = Source & Mixin;
@@ -113,7 +112,7 @@ const path = process.env.NODE_ENV === 'test'
 
 export function loadConfig() {
 	const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
-	const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json')
+	const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json');
 	const clientManifest = clientManifestExists ?
 		JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
 		: { 'src/init.ts': { file: 'src/init.ts' } };
@@ -140,6 +139,17 @@ export function loadConfig() {
 	mixin.clientEntry = clientManifest['src/init.ts'];
 	mixin.clientManifestExists = clientManifestExists;
 
+	const externalMediaProxy = config.mediaProxy ?
+		config.mediaProxy.endsWith('/') ? config.mediaProxy.substring(0, config.mediaProxy.length - 1) : config.mediaProxy
+		: null;
+	const internalMediaProxy = `${mixin.scheme}://${mixin.host}/proxy`;
+	mixin.mediaProxy = externalMediaProxy ?? internalMediaProxy;
+	mixin.externalMediaProxyEnabled = externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy;
+
+	mixin.videoThumbnailGenerator = config.videoThumbnailGenerator ?
+		config.videoThumbnailGenerator.endsWith('/') ? config.videoThumbnailGenerator.substring(0, config.videoThumbnailGenerator.length - 1) : config.videoThumbnailGenerator
+		: null;
+
 	if (!config.redis.prefix) config.redis.prefix = mixin.host;
 
 	return Object.assign(config, mixin);

packages/backend/src/core/AccountUpdateService.ts

@@ -32,7 +32,7 @@ export class AccountUpdateService {
 	
 		// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
 		if (this.userEntityService.isLocalUser(user)) {
-			const content = this.apRendererService.renderActivity(this.apRendererService.renderUpdate(await this.apRendererService.renderPerson(user), user));
+			const content = this.apRendererService.addContext(this.apRendererService.renderUpdate(await this.apRendererService.renderPerson(user), user));
 			this.apDeliverManagerService.deliverToFollowers(user, content);
 			this.relayService.deliverToRelays(user, content);
 		}

packages/backend/src/core/AchievementService.ts

@@ -0,0 +1,121 @@
+import { Inject, Injectable } from '@nestjs/common';
+import type { UserProfilesRepository, UsersRepository } from '@/models/index.js';
+import type { User } from '@/models/entities/User.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { CreateNotificationService } from '@/core/CreateNotificationService.js';
+
+export const ACHIEVEMENT_TYPES = [
+	'notes1',
+	'notes10',
+	'notes100',
+	'notes500',
+	'notes1000',
+	'notes5000',
+	'notes10000',
+	'notes20000',
+	'notes30000',
+	'notes40000',
+	'notes50000',
+	'notes60000',
+	'notes70000',
+	'notes80000',
+	'notes90000',
+	'notes100000',
+	'login3',
+	'login7',
+	'login15',
+	'login30',
+	'login60',
+	'login100',
+	'login200',
+	'login300',
+	'login400',
+	'login500',
+	'login600',
+	'login700',
+	'login800',
+	'login900',
+	'login1000',
+	'passedSinceAccountCreated1',
+	'passedSinceAccountCreated2',
+	'passedSinceAccountCreated3',
+	'loggedInOnBirthday',
+	'loggedInOnNewYearsDay',
+	'noteClipped1',
+	'noteFavorited1',
+	'myNoteFavorited1',
+	'profileFilled',
+	'markedAsCat',
+	'following1',
+	'following10',
+	'following50',
+	'following100',
+	'following300',
+	'followers1',
+	'followers10',
+	'followers50',
+	'followers100',
+	'followers300',
+	'followers500',
+	'followers1000',
+	'collectAchievements30',
+	'viewAchievements3min',
+	'iLoveMisskey',
+	'foundTreasure',
+	'client30min',
+	'noteDeletedWithin1min',
+	'postedAtLateNight',
+	'postedAt0min0sec',
+	'selfQuote',
+	'htl20npm',
+	'viewInstanceChart',
+	'outputHelloWorldOnScratchpad',
+	'open3windows',
+	'driveFolderCircularReference',
+	'reactWithoutRead',
+	'clickedClickHere',
+	'justPlainLucky',
+	'setNameToSyuilo',
+	'cookieClicked',
+	'brainDiver',
+] as const;
+
+@Injectable()
+export class AchievementService {
+	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
+
+		private createNotificationService: CreateNotificationService,
+	) {
+	}
+
+	@bindThis
+	public async create(
+		userId: User['id'],
+		type: typeof ACHIEVEMENT_TYPES[number],
+	): Promise<void> {
+		if (!ACHIEVEMENT_TYPES.includes(type)) return;
+
+		const date = Date.now();
+
+		const profile = await this.userProfilesRepository.findOneByOrFail({ userId: userId });
+
+		if (profile.achievements.some(a => a.name === type)) return;
+
+		await this.userProfilesRepository.update(userId, {
+			achievements: [...profile.achievements, {
+				name: type,
+				unlockedAt: date,
+			}],
+		});
+
+		this.createNotificationService.createNotification(userId, 'achievementEarned', {
+			achievement: type,
+		});
+	}
+}

packages/backend/src/core/AntennaService.ts

@@ -10,10 +10,9 @@ import { isUserRelated } from '@/misc/is-user-related.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { PushNotificationService } from '@/core/PushNotificationService.js';
 import * as Acct from '@/misc/acct.js';
-import { Cache } from '@/misc/cache.js';
 import type { Packed } from '@/misc/schema.js';
 import { DI } from '@/di-symbols.js';
-import type { MutingsRepository, BlockingsRepository, NotesRepository, AntennaNotesRepository, AntennasRepository, UserGroupJoiningsRepository, UserListJoiningsRepository } from '@/models/index.js';
+import type { MutingsRepository, NotesRepository, AntennaNotesRepository, AntennasRepository, UserListJoiningsRepository } from '@/models/index.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { StreamMessages } from '@/server/api/stream/types.js';
@@ -23,7 +22,6 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 export class AntennaService implements OnApplicationShutdown {
 	private antennasFetched: boolean;
 	private antennas: Antenna[];
-	private blockingCache: Cache<User['id'][]>;
 
 	constructor(
 		@Inject(DI.redisSubscriber)
@@ -32,9 +30,6 @@ export class AntennaService implements OnApplicationShutdown {
 		@Inject(DI.mutingsRepository)
 		private mutingsRepository: MutingsRepository,
 
-		@Inject(DI.blockingsRepository)
-		private blockingsRepository: BlockingsRepository,
-
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
@@ -44,22 +39,18 @@ export class AntennaService implements OnApplicationShutdown {
 		@Inject(DI.antennasRepository)
 		private antennasRepository: AntennasRepository,
 
-		@Inject(DI.userGroupJoiningsRepository)
-		private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-
 		@Inject(DI.userListJoiningsRepository)
 		private userListJoiningsRepository: UserListJoiningsRepository,
 
 		private utilityService: UtilityService,
 		private idService: IdService,
-		private globalEventServie: GlobalEventService,
+		private globalEventService: GlobalEventService,
 		private pushNotificationService: PushNotificationService,
 		private noteEntityService: NoteEntityService,
 		private antennaEntityService: AntennaEntityService,
 	) {
 		this.antennasFetched = false;
 		this.antennas = [];
-		this.blockingCache = new Cache<User['id'][]>(1000 * 60 * 5);
 
 		this.redisSubscriber.on('message', this.onRedisMessage);
 	}
@@ -77,10 +68,16 @@ export class AntennaService implements OnApplicationShutdown {
 			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'antennaCreated':
-					this.antennas.push(body);
+					this.antennas.push({
+						...body,
+						createdAt: new Date(body.createdAt),
+					});
 					break;
 				case 'antennaUpdated':
-					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = body;
+					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
+						...body,
+						createdAt: new Date(body.createdAt),
+					};
 					break;
 				case 'antennaDeleted':
 					this.antennas = this.antennas.filter(a => a.id !== body.id);
@@ -103,7 +100,7 @@ export class AntennaService implements OnApplicationShutdown {
 			read: read,
 		});
 	
-		this.globalEventServie.publishAntennaStream(antenna.id, 'note', note);
+		this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 	
 		if (!read) {
 			const mutings = await this.mutingsRepository.find({
@@ -133,7 +130,7 @@ export class AntennaService implements OnApplicationShutdown {
 			setTimeout(async () => {
 				const unread = await this.antennaNotesRepository.findOneBy({ antennaId: antenna.id, read: false });
 				if (unread) {
-					this.globalEventServie.publishMainStream(antenna.userId, 'unreadAntenna', antenna);
+					this.globalEventService.publishMainStream(antenna.userId, 'unreadAntenna', antenna);
 					this.pushNotificationService.pushNotification(antenna.userId, 'unreadAntennaNote', {
 						antenna: { id: antenna.id, name: antenna.name },
 						note: await this.noteEntityService.pack(note),
@@ -149,10 +146,6 @@ export class AntennaService implements OnApplicationShutdown {
 	public async checkHitAntenna(antenna: Antenna, note: (Note | Packed<'Note'>), noteUser: { id: User['id']; username: string; host: string | null; }): Promise<boolean> {
 		if (note.visibility === 'specified') return false;
 		if (note.visibility === 'followers') return false;
-
-		// アンテナ作成者がノート作成者にブロックされていたらスキップ
-		const blockings = await this.blockingCache.fetch(noteUser.id, () => this.blockingsRepository.findBy({ blockerId: noteUser.id }).then(res => res.map(x => x.blockeeId)));
-		if (blockings.some(blocking => blocking === antenna.userId)) return false;
 	
 		if (!antenna.withReplies && note.replyId != null) return false;
 	
@@ -164,14 +157,6 @@ export class AntennaService implements OnApplicationShutdown {
 			})).map(x => x.userId);
 	
 			if (!listUsers.includes(note.userId)) return false;
-		} else if (antenna.src === 'group') {
-			const joining = await this.userGroupJoiningsRepository.findOneByOrFail({ id: antenna.userGroupJoiningId! });
-	
-			const groupUsers = (await this.userGroupJoiningsRepository.findBy({
-				userGroupId: joining.userGroupId,
-			})).map(x => x.userId);
-	
-			if (!groupUsers.includes(note.userId)) return false;
 		} else if (antenna.src === 'users') {
 			const accts = antenna.users.map(x => {
 				const { username, host } = Acct.parse(x);